Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge1.out @ 3328:49966b5ab16f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix traceback of extdiff after a merge - files that comes from a different branch are marked as modified but aren't present in the original manifest - add a testcase for extdiff and for regular diff
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 11 Oct 2006 16:35:09 +0200
parents a31557193f3c
children f472cf9a71af
comparison
equal deleted inserted replaced
3299:a1aad25ccc3e 3328:49966b5ab16f
2 %% no merges expected 2 %% no merges expected
3 merging for b 3 merging for b
4 merging b 4 merging b
5 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 5 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
6 (branch merge, don't forget to commit) 6 (branch merge, don't forget to commit)
7 diff -r d9e5953b9dec b
8 --- /dev/null
9 +++ b/b
10 @@ -0,0 +1,1 @@
11 +This is file b1
12 M b
7 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 13 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
8 %% merge should fail 14 %% merge should fail
9 abort: 'b' already exists in the working dir and differs from remote 15 abort: 'b' already exists in the working dir and differs from remote
10 %% merge of b expected 16 %% merge of b expected
11 merging for b 17 merging for b
12 merging b 18 merging b
13 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 19 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
14 (branch merge, don't forget to commit) 20 (branch merge, don't forget to commit)
21 diff -r d9e5953b9dec b
22 --- /dev/null
23 +++ b/b
24 @@ -0,0 +1,1 @@
25 +This is file b2
26 M b
15 %% 27 %%
16 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 28 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
17 Contents of b should be "this is file b1" 29 Contents of b should be "this is file b1"
18 This is file b1 30 This is file b1
19 %% merge fails 31 %% merge fails
21 %% merge expected! 33 %% merge expected!
22 merging for b 34 merging for b
23 merging b 35 merging b
24 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 36 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
25 (branch merge, don't forget to commit) 37 (branch merge, don't forget to commit)
38 diff -r c1dd73cbf59f b
39 --- a/b
40 +++ b/b
41 @@ -1,1 +1,1 @@ This is file b1
42 -This is file b1
43 +This is file b22
44 M b
26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 45 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
27 %% merge of b should fail 46 %% merge of b should fail
28 abort: outstanding uncommitted changes 47 abort: outstanding uncommitted changes
29 %% merge of b expected 48 %% merge of b expected
30 merging for b 49 merging for b
31 merging b 50 merging b
32 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 51 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
33 (branch merge, don't forget to commit) 52 (branch merge, don't forget to commit)
53 diff -r c1dd73cbf59f b
54 --- a/b
55 +++ b/b
56 @@ -1,1 +1,1 @@ This is file b1
57 -This is file b1
58 +This is file b33
59 M b