Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-rename-after-merge.out @ 5318:c6682cdada2f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Test renaming files brought by merge second parent (issue 746)
author Patrick Mezard <pmezard@gmail.com>
date Sun, 23 Sep 2007 14:40:44 +0200
parents
children
comparison
equal deleted inserted replaced
5317:ef65d6ec114e 5318:c6682cdada2f
1 % create source repository
2 adding a
3 % fork source repository
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5 adding b
6 % update source repository
7 % merge repositories
8 pulling from ../t2
9 searching for changes
10 adding changesets
11 adding manifests
12 adding file changes
13 added 1 changesets with 1 changes to 1 files (+1 heads)
14 (run 'hg heads' to see heads, 'hg merge' to merge)
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
16 (branch merge, don't forget to commit)
17 % rename b as c
18 A c
19 R b
20 % rename back c as b