sapling/tests/test-imerge.out

adding bar
adding foo
1 files updated, 0 files merged, 1 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)
U foo
foo
bar
bar
bar
% status -v
merging e6da46716401 and 30d266f502e7
U foo (foo2)
% next
foo
% merge next
merging foo and foo2
all conflicts resolved
% unresolve
% merge foo
merging foo and foo2
all conflicts resolved
% save
% load
2 files updated, 0 files merged, 1 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)
R foo
all conflicts resolved
foo
changeset:   3:fa9a6defdcaf
tag:         tip
parent:      2:e6da46716401
parent:      1:30d266f502e7
user:        test
date:        Thu Jan 01 00:00:03 1970 +0000
files:       foo foo2
description:
merged


% nothing to merge -- tip
abort: there is nothing to merge
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
% nothing to merge
abort: there is nothing to merge - use "hg update" instead
imerge extension and test 2007-08-01 22:37:11 +04:00			`adding bar`
			`adding foo`
imerge: handle renames 2007-08-04 05:05:20 +04:00			`1 files updated, 0 files merged, 1 files removed, 0 files unresolved`
imerge extension and test 2007-08-01 22:37:11 +04:00			`% start imerge`
			`1 files updated, 0 files merged, 0 files removed, 0 files unresolved`
			`(branch merge, don't forget to commit)`
imerge: gussy up dispatcher to support subcommand opts. Add -n, --resolved, --unresolved to status. 2007-08-04 23:26:48 +04:00			`U foo`
imerge extension and test 2007-08-01 22:37:11 +04:00			`foo`
			`bar`
			`bar`
			`bar`
imerge: gussy up dispatcher to support subcommand opts. Add -n, --resolved, --unresolved to status. 2007-08-04 23:26:48 +04:00			`% status -v`
imerge: handle renames 2007-08-04 05:05:20 +04:00			`merging e6da46716401 and 30d266f502e7`
imerge: gussy up dispatcher to support subcommand opts. Add -n, --resolved, --unresolved to status. 2007-08-04 23:26:48 +04:00			`U foo (foo2)`
imerge: handle renames 2007-08-04 05:05:20 +04:00			`% next`
			`foo`
imerge extension and test 2007-08-01 22:37:11 +04:00			`% merge next`
imerge: handle renames 2007-08-04 05:05:20 +04:00			`merging foo and foo2`
imerge extension and test 2007-08-01 22:37:11 +04:00			`all conflicts resolved`
			`% unresolve`
			`% merge foo`
imerge: handle renames 2007-08-04 05:05:20 +04:00			`merging foo and foo2`
imerge extension and test 2007-08-01 22:37:11 +04:00			`all conflicts resolved`
			`% save`
			`% load`
imerge: handle renames 2007-08-04 05:05:20 +04:00			`2 files updated, 0 files merged, 1 files removed, 0 files unresolved`
imerge extension and test 2007-08-01 22:37:11 +04:00			`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)`
imerge: gussy up dispatcher to support subcommand opts. Add -n, --resolved, --unresolved to status. 2007-08-04 23:26:48 +04:00			`R foo`
imerge extension and test 2007-08-01 22:37:11 +04:00			`all conflicts resolved`
			`foo`
imerge: handle renames 2007-08-04 05:05:20 +04:00			`changeset: 3:fa9a6defdcaf`
imerge extension and test 2007-08-01 22:37:11 +04:00			`tag: tip`
			`parent: 2:e6da46716401`
imerge: handle renames 2007-08-04 05:05:20 +04:00			`parent: 1:30d266f502e7`
imerge extension and test 2007-08-01 22:37:11 +04:00			`user: test`
			`date: Thu Jan 01 00:00:03 1970 +0000`
imerge: handle renames 2007-08-04 05:05:20 +04:00			`files: foo foo2`
imerge extension and test 2007-08-01 22:37:11 +04:00			`description:`
			`merged`


improve error message for 'hg merge' when repo already at branchtip 2007-08-25 13:30:11 +04:00			`% nothing to merge -- tip`
			`abort: there is nothing to merge`
			`2 files updated, 0 files merged, 1 files removed, 0 files unresolved`
imerge extension and test 2007-08-01 22:37:11 +04:00			`% nothing to merge`
			`abort: there is nothing to merge - use "hg update" instead`