tests/test-rename-after-merge.out
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
Wed, 20 Aug 2008 10:30:53 +0200
changeset 6915 ef14c773b3d6
parent 6338 0750f11152fe
child 7689 d821ea464465
permissions -rw-r--r--
mq: fix docs for qrefresh -D (issue1234)

% create source repository
adding a
% fork source repository
updating working directory
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