Mercurial > hg
comparison tests/test-commit-unresolved.t @ 11804:6c24465613de
tests: unify test-commit-unresolved
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Thu, 12 Aug 2010 22:28:21 +0900 |
parents | tests/test-commit-unresolved@8766fee6f225 |
children | f2daa6ab514a |
comparison
equal
deleted
inserted
replaced
11803:b90199179eb5 | 11804:6c24465613de |
---|---|
1 $ echo "[extensions]" >> $HGRCPATH | |
2 $ echo "graphlog=" >> $HGRCPATH | |
3 | |
4 $ addcommit () { | |
5 > echo $1 > $1 | |
6 > hg add $1 | |
7 > hg commit -d "${2} 0" -m $1 | |
8 > } | |
9 | |
10 $ commit () { | |
11 > hg commit -d "${2} 0" -m $1 | |
12 > } | |
13 | |
14 $ hg init a | |
15 $ cd a | |
16 $ addcommit "A" 0 | |
17 $ addcommit "B" 1 | |
18 $ echo "C" >> A | |
19 $ commit "C" 2 | |
20 | |
21 $ hg update -C 0 | |
22 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
23 $ echo "D" >> A | |
24 $ commit "D" 3 | |
25 created new head | |
26 | |
27 Merging a conflict araises | |
28 | |
29 $ hg merge | |
30 merging A | |
31 warning: conflicts during merge. | |
32 merging A failed! | |
33 1 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
34 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon | |
35 | |
36 Correct the conflict without marking the file as resolved | |
37 | |
38 $ echo "ABCD" > A | |
39 $ hg commit -m "Merged" | |
40 abort: unresolved merge conflicts (see hg resolve) | |
41 | |
42 Mark the conflict as resolved and commit | |
43 | |
44 $ hg resolve -m A | |
45 $ hg commit -m "Merged" | |
46 | |
47 $ exit 0 |