|
1 Tests the resolution of divergence |
|
2 |
|
3 $ cat >> $HGRCPATH <<EOF |
|
4 > [defaults] |
|
5 > amend=-d "0 0" |
|
6 > fold=-d "0 0" |
|
7 > [web] |
|
8 > push_ssl = false |
|
9 > allow_push = * |
|
10 > [phases] |
|
11 > publish = False |
|
12 > [diff] |
|
13 > git = 1 |
|
14 > unified = 0 |
|
15 > [ui] |
|
16 > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline} [{troubles}]\n |
|
17 > [extensions] |
|
18 > hgext.graphlog= |
|
19 > EOF |
|
20 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH |
|
21 $ mkcommit() { |
|
22 > echo "$1" > "$1" |
|
23 > hg add "$1" |
|
24 > hg ci -m "add $1" |
|
25 > } |
|
26 |
|
27 $ mkcommits() { |
|
28 > for i in $@; do mkcommit $i ; done |
|
29 > } |
|
30 |
|
31 Basic test of divergence: two divergent changesets with the same parents |
|
32 With --all --any we dedupe the divergent and solve the divergence once |
|
33 |
|
34 $ hg init test1 |
|
35 $ cd test1 |
|
36 $ mkcommits _a _b |
|
37 $ hg up "desc(_a)" |
|
38 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
39 $ mkcommit bdivergent1 |
|
40 created new head |
|
41 $ hg up "desc(_a)" |
|
42 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
43 $ mkcommit bdivergent2 |
|
44 created new head |
|
45 $ hg prune -s "desc(bdivergent1)" "desc(_b)" |
|
46 1 changesets pruned |
|
47 $ hg prune -s "desc(bdivergent2)" "desc(_b)" --hidden |
|
48 1 changesets pruned |
|
49 2 new divergent changesets |
|
50 $ hg log -G |
|
51 @ 3:e708fd28d5cf@default(draft) add bdivergent2 [divergent] |
|
52 | |
|
53 | o 2:c2f698071cba@default(draft) add bdivergent1 [divergent] |
|
54 |/ |
|
55 o 0:135f39f4bd78@default(draft) add _a [] |
|
56 |
|
57 $ hg evolve --all --any --divergent |
|
58 merge:[2] add bdivergent1 |
|
59 with: [3] add bdivergent2 |
|
60 base: [1] add _b |
|
61 updating to "local" conflict |
|
62 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
63 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
64 working directory is now at c26f1d3baed2 |
|
65 $ hg log -G |
|
66 @ 5:c26f1d3baed2@default(draft) add bdivergent1 [] |
|
67 | |
|
68 o 0:135f39f4bd78@default(draft) add _a [] |
|
69 |
|
70 $ cd .. |