Mercurial > hg > gitweb

comparison tests/test-merge1.out @ 3311:966632304dde

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: shortcircuit filemerge for identical files - use filectx.cmp to compare files - move merge messages into filemerge - kill the redundant resolving message - update tests
author Matt Mackall <mpm@selenic.com>
date Tue, 10 Oct 2006 01:16:06 -0500
parents a31557193f3c
children f472cf9a71af
comparison
equal deleted inserted replaced
3310:0e370798eebf 3311:966632304dde
1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
2 %% no merges expected 2 %% no merges expected
3 merging for b
4 merging b
5 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 3 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
6 (branch merge, don't forget to commit) 4 (branch merge, don't forget to commit)
7 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 5 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
8 %% merge should fail 6 %% merge should fail
9 abort: 'b' already exists in the working dir and differs from remote 7 abort: 'b' already exists in the working dir and differs from remote
17 Contents of b should be "this is file b1" 15 Contents of b should be "this is file b1"
18 This is file b1 16 This is file b1
19 %% merge fails 17 %% merge fails
20 abort: outstanding uncommitted changes 18 abort: outstanding uncommitted changes
21 %% merge expected! 19 %% merge expected!
22 merging for b
23 merging b
24 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 20 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
25 (branch merge, don't forget to commit) 21 (branch merge, don't forget to commit)
26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 22 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
27 %% merge of b should fail 23 %% merge of b should fail
28 abort: outstanding uncommitted changes 24 abort: outstanding uncommitted changes