Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-imerge.out @ 5055:56d48aed1f69

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
imerge: tarfile.extractall is only available in python2.5
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 02 Aug 2007 14:04:00 +0200
parents 58006f8b8275
children 86327d13d916
line wrap: on
line source

adding bar
adding foo
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% start imerge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
merging e6da46716401 and 1c0a86e7db0d
remaining:
  foo
foo
bar
bar
bar
% status
merging e6da46716401 and 1c0a86e7db0d
remaining:
  foo
% merge next
merging foo
all conflicts resolved
% unresolve
% merge foo
merging foo
all conflicts resolved
% save
% load
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
merging e6da46716401 and 1c0a86e7db0d
resolved:
  foo
all conflicts resolved
foo
changeset:   3:eaf80a943462
tag:         tip
parent:      2:e6da46716401
parent:      1:1c0a86e7db0d
user:        test
date:        Thu Jan 01 00:00:03 1970 +0000
files:       foo
description:
merged


% nothing to merge
abort: there is nothing to merge - use "hg update" instead