Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge1.out @ 1877:d314a89fa4f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change lock format to let us detect and break stale locks. old style: symlink to pid new style: symlink to hostname:pid if lock code finds new-style lock, it breaks lock if locking pid is on same machine and pid is not alive. otherwise, lock is left alone. this makes locking code safe with old-style locks and with locks on other machines. new code makes server part of mercurial more robust in case machine crashes, power fails, or crazy user does kill -9.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 10 Mar 2006 08:31:31 -0800
parents db10b7114de0
children 2da2d46862fb
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
db10b7114de0 abort when merging two heads and repository has local changes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1236
diff changeset
11 abort: outstanding uncommited 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
db10b7114de0 abort when merging two heads and repository has local changes
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1236
diff changeset
16 abort: outstanding uncommited 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