~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 29197bc) | patch
Don't assume there is always a stage 2 in git.get_conflicts
authorCatalin Marinas <catalin.marinas@gmail.com>
Wed, 19 Dec 2007 18:00:15 +0000 (18:00 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 19 Dec 2007 23:13:32 +0000 (23:13 +0000)
commit40bd629038e0166f931c4e39b1ee5511d6dc18c1
tree29b959ef1f8f1dbe89650e7f2f444374619efb19tree | snapshot (tar.gz zip)
parent29197bc02c1b5087017da9a86214e9b620f0439ecommit | diff
Don't assume there is always a stage 2 in git.get_conflicts

For example, the t1202-push-undo.sh test generates a conflict where a
file was added in both current and patch but different content and
missing in ancestor, therefore no stage 2.

There could also be a case where stage 3 is missing if a file is
removed by the patch being pushed.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
stgit/git.py diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)