Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge1.out @ 2131:f5bbc5562434

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Try harder to display node hashes in tags view in monospaced font. Used to work around Firefox's behaviour if "Allow pages to choose their own fonts" is disabled.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 26 Apr 2006 07:03:10 +0200
parents 2da2d46862fb
children b2ae81a7df29
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents: 925
diff changeset
1 %% no merges expected
1581
db10b7114de0 abort when merging two heads and repository has local changes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1236
diff changeset
2 %% merge should fail
db10b7114de0 abort when merging two heads and repository has local changes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1236
diff changeset
3 abort: 'b' already exists in the working dir and differs from remote
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents: 925
diff changeset
4 %% merge of b expected
407
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset
5 merging for b
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset
6 merging b
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents: 925
diff changeset
7 %%
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents: 925
diff changeset
8 Contents of b should be "this is file b1"
430
5b22029b5aa2 Fix up test-merge1
mpm@selenic.com
parents: 407
diff changeset
9 This is file b1
1581
db10b7114de0 abort when merging two heads and repository has local changes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1236
diff changeset
10 %% merge fails
1995
2da2d46862fb Spelling fix: "commited" -> "committed"
mcmillen@cs.cmu.edu
parents: 1581
diff changeset
11 abort: outstanding uncommitted changes
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents: 925
diff changeset
12 %% merge expected!
430
5b22029b5aa2 Fix up test-merge1
mpm@selenic.com
parents: 407
diff changeset
13 merging for b
5b22029b5aa2 Fix up test-merge1
mpm@selenic.com
parents: 407
diff changeset
14 merging b
1581
db10b7114de0 abort when merging two heads and repository has local changes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1236
diff changeset
15 %% merge of b should fail
1995
2da2d46862fb Spelling fix: "commited" -> "committed"
mcmillen@cs.cmu.edu
parents: 1581
diff changeset
16 abort: outstanding uncommitted changes
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents: 925
diff changeset
17 %% merge of b expected
407
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset
18 merging for b
0e0d0670b2bc [PATCH] Merging identical changes from another branch
mpm@selenic.com
parents:
diff changeset
19 merging b