tree 6e23e7a0163891c3f28bd1c5a190285bf7c99f02
parent 27ac3b84aaab17eeb055befe249d235a0eb556b5
author Peter Maydell <peter.maydell@linaro.org> 1335292273 +0100
committer Catalin Marinas <catalin.marinas@gmail.com> 1335782049 +0100

stgit/git.py: Handle a reset that changes files to directories

If reset() takes us from a tree where some path is a file to one
where it is a directory, then checkout() will replace the file
with the directory, and we don't want to try to os.remove() the
path (which would throw an exception because we're trying to
remove a directory.) This fixes bug https://gna.org/bugs/?15682.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>