Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-rename-dir-merge.out @ 3748:7b88bd88f040

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix test-rename-dir-merge for different implementations of ls.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 01 Dec 2006 15:40:23 +0100
parents 205f0fd4a4a1
children 4787e2b0dd03
comparison
equal deleted inserted replaced
3747:b5c4d749f37f 3748:7b88bd88f040
19 moving a/c to b/c 19 moving a/c to b/c
20 getting b/a 20 getting b/a
21 getting b/b 21 getting b/b
22 3 files updated, 0 files merged, 2 files removed, 0 files unresolved 22 3 files updated, 0 files merged, 2 files removed, 0 files unresolved
23 (branch merge, don't forget to commit) 23 (branch merge, don't forget to commit)
24 ls: a/: No such file or directory 24 a/* b/a b/b b/c
25 b/:
26 a
27 b
28 c
29 M b/a 25 M b/a
30 M b/b 26 M b/b
31 A b/c 27 A b/c
32 a/c 28 a/c
33 R a/a 29 R a/a
39 ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb 35 ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb
40 None: local renamed directory to b/c -> d 36 None: local renamed directory to b/c -> d
41 getting a/c to b/c 37 getting a/c to b/c
42 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 38 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
43 (branch merge, don't forget to commit) 39 (branch merge, don't forget to commit)
44 ls: a/: No such file or directory 40 a/* b/a b/b b/c
45 b/:
46 a
47 b
48 c
49 A b/c 41 A b/c
50 a/c 42 a/c