Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-rename-dir-merge @ 4668:e241598e956f
Remove useless variable assignments in util.opener.
The original idea might have been to prevent circular references, but
as this assignment would have created another reference, this makes
no difference.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 21 Jun 2007 19:24:27 +0200 |
parents | 7b88bd88f040 |
children | dee573ba79f1 |
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" | |
27 | |
28 hg co -C 1 | |
29 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
|
30 echo a/* b/* |
3733 | 31 hg st -C |
32 hg ci -m "4 merge 1+2" -d "0 0" |