Mercurial > hg

comparison tests/test-add.out @ 6042:2da5b19a6460

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 06 Feb 2008 19:57:52 -0800
parents 5af5f0f9d724
children 4b0c9c674707
comparison
equal deleted inserted replaced
6041:dd714452c26e 6042:2da5b19a6460
1 adding a
2 ? a
3 adding a
4 A a
5 A a
6 ? b
7 A a
8 A b
9 % should fail
10 b already tracked!
11 A a
12 A b
13 % should fail
14 a already tracked!
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
16 merging a
17 warning: conflicts during merge.
18 merging a failed!
19 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
20 There are unresolved merges, you can redo the full merge using:
21 hg update -C 2
22 hg merge 1
23 M a
24 ? a.orig
25 % should fail
26 a already tracked!
27 M a
28 ? a.orig
29 % issue683
30 R a
31 ? a.orig
32 M a
33 ? a.orig
34 c does not exist!
35 d does not exist!
36 M a
37 A c
38 ? a.orig