Mercurial > hg

view tests/test-rename-after-merge.out @ 7404:07cb58b8c843

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improved error message for log --follow Mads Kiilerich notes that the existing message was unclear when a nonexistent file was supplied.
author Brendan Cully <brendan@kublai.com>
date Mon, 24 Nov 2008 17:16:39 -0800
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