Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-rename-dir-merge.out @ 5244:dee573ba79f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
correctly record file-level history when the local side renames a directory
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 27 Aug 2007 14:21:04 -0300
parents bb1800a7d7e1
children 17ed9b9a0d03
comparison
equal deleted inserted replaced
5243:8050f13772f6 5244:dee573ba79f1
27 A b/c 27 A b/c
28 a/c 28 a/c
29 R a/a 29 R a/a
30 R a/b 30 R a/b
31 R a/c 31 R a/c
32 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88
32 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 33 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
33 resolving manifests 34 resolving manifests
34 overwrite None partial False 35 overwrite None partial False
35 ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb 36 ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb
36 None: local renamed directory to b/c -> d 37 None: local renamed directory to b/c -> d
38 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 39 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
39 (branch merge, don't forget to commit) 40 (branch merge, don't forget to commit)
40 a/* b/a b/b b/c 41 a/* b/a b/b b/c
41 A b/c 42 A b/c
42 a/c 43 a/c
44 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88