tests/test-rename-after-merge.out
author Christian Ebert <blacktrash@gmx.net>
Mon, 10 Dec 2007 00:35:04 +0000
changeset 5661 ba40e267762b
parent 5608 784eadabd985
child 6338 0750f11152fe
permissions -rw-r--r--
Remove spurious escape attempt in hg.1.txt

% 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)
M b
% rename b as c
A c
R b
% rename back c as b
M b