tests/test-rename-after-merge.out
author Patrick Mezard <pmezard@gmail.com>
Sun, 23 Sep 2007 14:40:44 +0200
changeset 5318 c6682cdada2f
child 5608 784eadabd985
permissions -rw-r--r--
Test renaming files brought by merge second parent (issue 746)

% create source repository
adding a
% fork source repository
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
% update source repository
% merge repositories
pulling from ../t2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% rename b as c
A c
R b
% rename back c as b