Mercurial > hg
annotate tests/test-rename-dir-merge @ 7012:78341ea65d16
restructure helptable
When looking up a help topic, the key is now only matched against the
short names for each topic, and not the header. So
hg help 'Environment Variables'
must be replaced with
hg help env
author | Martin Geisler <mg@daimi.au.dk> |
---|---|
date | Tue, 09 Sep 2008 21:32:39 +0200 |
parents | 56e9f7b2d8fa |
children | 6c82beaaa11a |
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 | |
5567
56e9f7b2d8fa
rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
10 hg ci -Am "0" -d "0 0" |
3733 | 11 |
12 hg co -C 0 | |
13 hg mv a b | |
14 hg ci -m "1 mv a/ b/" -d "0 0" | |
15 | |
16 hg co -C 0 | |
17 echo baz > a/c | |
5567
56e9f7b2d8fa
rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
18 echo quux > a/d |
3733 | 19 hg add a/c |
20 hg ci -m "2 add a/c" -d "0 0" | |
21 | |
22 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
|
23 echo a/* b/* |
3733 | 24 hg st -C |
25 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
|
26 hg debugrename b/c |
3733 | 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" | |
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
|
33 hg debugrename b/c |