Mercurial > hg

comparison tests/test-merge1.out @ 1581:db10b7114de0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
abort when merging two heads and repository has local changes
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 14 Dec 2005 22:19:03 -0600
parents 67a28636ea64
children 2da2d46862fb
comparison
equal deleted inserted replaced
1580:4737b36e324e 1581:db10b7114de0
1 %% no merges expected 1 %% no merges expected
2 %% merge should fail
3 abort: 'b' already exists in the working dir and differs from remote
2 %% merge of b expected 4 %% merge of b expected
3 merging for b 5 merging for b
4 merging b 6 merging b
5 %% 7 %%
6 Contents of b should be "this is file b1" 8 Contents of b should be "this is file b1"
7 This is file b1 9 This is file b1
10 %% merge fails
11 abort: outstanding uncommited changes
8 %% merge expected! 12 %% merge expected!
9 merging for b 13 merging for b
10 merging b 14 merging b
15 %% merge of b should fail
16 abort: outstanding uncommited changes
11 %% merge of b expected 17 %% merge of b expected
12 merging for b 18 merging for b
13 merging b 19 merging b