| commit | b825e6ff5d003db8efd1ed43cdbbb9d637df0a0c | |
| author | Junio C Hamano <junkio@cox.net> | |
| Sun, 11 Dec 2005 20:44:46 +0000 (11 12:44 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 11 Dec 2005 20:44:46 +0000 (11 12:44 -0800) | ||
| tree | d73c55875616862da1471898b8b29003ccffe152 | treesnapshot (tar.gz zip) |
| parent | 157dc07368faf6537af1d2ce676a4f2dda2f71a6 | commitdiff |
t/t6022: a new test for renaming merge.
This adds a couple of tests to cover the following renaming
merge cases:
- one side renames and the other side does not, with and without
content conflicts.
- both side rename to the same path, with and without content
conflicts.
The test setup also prepares a case in which both side rename to
different destination, but currently the code collapses these
destination paths and removes the original path, which may be
wrong. The outcome of this case is not checked by the tests in
this round.
Signed-off-by: Junio C Hamano <junkio@cox.net>
This adds a couple of tests to cover the following renaming
merge cases:
- one side renames and the other side does not, with and without
content conflicts.
- both side rename to the same path, with and without content
conflicts.
The test setup also prepares a case in which both side rename to
different destination, but currently the code collapses these
destination paths and removes the original path, which may be
wrong. The outcome of this case is not checked by the tests in
this round.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| t/t6022-merge-rename.sh | [new file with mode: 0755] | blob |