Mercurial > hg
annotate tests/test-rename-dir-merge @ 5323:46455285c6b5
Merge with crew-stable
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 23 Sep 2007 15:29:58 +0200 |
parents | dee573ba79f1 |
children | 56e9f7b2d8fa |
rev | line source |
---|---|
3733 | 1 #!/bin/sh |
2 | |
3 mkdir t | |
4 cd t | |
5 hg init | |
6 | |
7 mkdir a | |
8 echo foo > a/a | |
9 echo bar > a/b | |
10 | |
11 hg add a | |
12 hg ci -m "0" -d "0 0" | |
13 | |
14 hg co -C 0 | |
15 hg mv a b | |
16 hg ci -m "1 mv a/ b/" -d "0 0" | |
17 | |
18 hg co -C 0 | |
19 echo baz > a/c | |
20 hg add a/c | |
21 hg ci -m "2 add a/c" -d "0 0" | |
22 | |
23 hg merge --debug 1 | |
3748
7b88bd88f040
Fix test-rename-dir-merge for different implementations of ls.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3734
diff
changeset
|
24 echo a/* b/* |
3733 | 25 hg st -C |
26 hg ci -m "3 merge 2+1" -d "0 0" | |
5229
dee573ba79f1
correctly record file-level history when the local side renames a directory
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3748
diff
changeset
|
27 hg debugrename b/c |
3733 | 28 |
29 hg co -C 1 | |
30 hg merge --debug 2 | |
3748
7b88bd88f040
Fix test-rename-dir-merge for different implementations of ls.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3734
diff
changeset
|
31 echo a/* b/* |
3733 | 32 hg st -C |
33 hg ci -m "4 merge 1+2" -d "0 0" | |
5229
dee573ba79f1
correctly record file-level history when the local side renames a directory
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3748
diff
changeset
|
34 hg debugrename b/c |