Mercurial > hg

view tests/test-rename-after-merge.out @ 7528:eadcc075967e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
archive: fix bogus error message with no working directory
author Matt Mackall <mpm@selenic.com>
date Fri, 19 Dec 2008 16:48:31 -0600
parents 0750f11152fe
children d821ea464465
line wrap: on
line source

% 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