Mercurial > hg

view tests/test-rename-after-merge.out @ 5977:e82dd2dd6276

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix markup of templates/{,old/}header.tmpl
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sun, 03 Feb 2008 21:03:46 -0200
parents c6682cdada2f
children 784eadabd985
line wrap: on
line source

% 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