Mercurial > hg
view tests/test-rename-after-merge.out @ 7465:8f0305874701
tests: allow cvs import to reorder its filename list
Also fix script to generate non-zero length test file b.
author | Frank Kingswood <frank@kingswood-consulting.co.uk> |
---|---|
date | Mon, 01 Dec 2008 13:42:04 +0000 |
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