summaryrefslogtreecommitdiff
path: root/git_remote_helpers/__init__.py
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2010-09-20 02:28:38 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-09-29 17:32:36 -0700
commit3398f2f58317e1a22093a0149a5eae1fe208b024 (patch)
treefccb1c272def788915acecb6de8409ce6414a250 /git_remote_helpers/__init__.py
parentt6022: Add test combinations of {content conflict?, D/F conflict remains?} (diff)
downloadtgif-3398f2f58317e1a22093a0149a5eae1fe208b024.tar.xz
t6022: Add tests for reversing order of merges when D/F conflicts present
When merging two branches with some path involved in a D/F conflict, the choice of which branch to merge into the other matters for (at least) two reasons: (1) whether the working copy has a directory full of files that is in the way of a file, or a file exists that is in the way of a directory of files, (2) when the directory full of files does not disappear due to the merge, what files at the same paths should be renamed to (e.g. filename~HEAD vs. filename~otherbranch). Add some tests that reverse the merge order of two other tests, and which verify the contents are as expected (namely, that the results are identical other than modified-for-uniqueness filenames involving branch names). Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git_remote_helpers/__init__.py')
0 files changed, 0 insertions, 0 deletions