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