| commit | 6d8bbd16bd72cf1c1ba8384d46a6beda23b3cb81 | |
| author | David Aguilar <davvid@gmail.com> | |
| Thu, 20 Nov 2008 20:40:23 +0000 (20 12:40 -0800) | ||
| committer | David Aguilar <davvid@gmail.com> | |
| Thu, 20 Nov 2008 20:36:58 +0000 (20 12:36 -0800) | ||
| tree | a89fa608f792a77235172af5d8e7ddef1f70c450 | treesnapshot (tar.gz zip) |
| parent | 0fe0bd382878bb3c7c1bb58448d1dee0f78e2cee | commitdiff |
models: properly detect merge conflicts with deleted files
When a file is deleted locally and changed on the remote side diff-index
reports the state as 'A' (added) since it's going to add it during the merge.
We now detect this and list it as an unmerged file.
Signed-off-by: David Aguilar <davvid@gmail.com>
When a file is deleted locally and changed on the remote side diff-index
reports the state as 'A' (added) since it's going to add it during the merge.
We now detect this and list it as an unmerged file.
Signed-off-by: David Aguilar <davvid@gmail.com>
| cola/models.py | diffblobblamehistory |