1 $ hg init public |
|
2 $ cd public |
|
3 $ echo a > a |
|
4 $ mkcommit() { |
|
5 > echo "$1" > "$1" |
|
6 > hg add "$1" |
|
7 > hg ci -m "add $1" |
|
8 > } |
|
9 $ hg commit -A -m init |
|
10 adding a |
|
11 $ cd .. |
|
12 |
|
13 $ evolvepath=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/ |
|
14 $ hg clone -U public private |
|
15 $ cd private |
|
16 $ cat >> .hg/hgrc <<EOF |
|
17 > [extensions] |
|
18 > evolve = $evolvepath |
|
19 > [ui] |
|
20 > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline}\n |
|
21 > [phases] |
|
22 > publish = false |
|
23 > EOF |
|
24 $ cd .. |
|
25 |
|
26 $ cp -a private alice |
|
27 $ cp -a private bob |
|
28 |
|
29 $ cd alice |
|
30 $ hg update |
|
31 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
32 $ echo a >> a |
|
33 $ hg commit -u alice -m 'modify a' |
|
34 $ hg push ../private |
|
35 pushing to ../private |
|
36 searching for changes |
|
37 adding changesets |
|
38 adding manifests |
|
39 adding file changes |
|
40 added 1 changesets with 1 changes to 1 files |
|
41 $ hg log -r 'draft()' |
|
42 1:4d1169d82e47@default(draft) modify a |
|
43 |
|
44 $ cd ../bob |
|
45 $ hg pull ../private |
|
46 pulling from ../private |
|
47 searching for changes |
|
48 adding changesets |
|
49 adding manifests |
|
50 adding file changes |
|
51 added 1 changesets with 1 changes to 1 files |
|
52 new changesets 4d1169d82e47 |
|
53 (run 'hg update' to get a working copy) |
|
54 $ hg log -r 'draft()' |
|
55 1:4d1169d82e47@default(draft) modify a |
|
56 $ hg push ../public |
|
57 pushing to ../public |
|
58 searching for changes |
|
59 adding changesets |
|
60 adding manifests |
|
61 adding file changes |
|
62 added 1 changesets with 1 changes to 1 files |
|
63 $ hg log -r 'draft()' |
|
64 |
|
65 $ cd ../alice |
|
66 $ hg amend -m 'tweak a' |
|
67 $ hg pull ../public |
|
68 pulling from ../public |
|
69 searching for changes |
|
70 no changes found |
|
71 1 new phase-divergent changesets |
|
72 |
|
73 $ hg evolve -a -A --phase-divergent |
|
74 recreate:[2] tweak a |
|
75 atop:[1] modify a |
|
76 computing new diff |
|
77 committed as 4d1169d82e47 |
|
78 working directory is now at 4d1169d82e47 |
|
79 |
|
80 Bumped Merge changeset: |
|
81 ----------------------- |
|
82 |
|
83 We currently cannot automatically solve bumped changeset that is the |
|
84 product of a merge, we add a test for it. |
|
85 |
|
86 $ mkcommit _a |
|
87 $ hg up .^ |
|
88 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
89 $ mkcommit _b |
|
90 created new head |
|
91 $ mkcommit _c |
|
92 $ hg log -G |
|
93 @ 5:eeaf70969381@default(draft) add _c |
|
94 | |
|
95 o 4:6612fc0ddeb6@default(draft) add _b |
|
96 | |
|
97 | o 3:154ad198ff4a@default(draft) add _a |
|
98 |/ |
|
99 o 1:4d1169d82e47@default(public) modify a |
|
100 | |
|
101 o 0:d3873e73d99e@default(public) init |
|
102 |
|
103 $ hg merge 3 |
|
104 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
105 (branch merge, don't forget to commit) |
|
106 $ hg commit -m "merge" |
|
107 $ hg commit --amend -m "New message" |
|
108 $ hg phase --public 551127da2a8a --hidden |
|
109 1 new phase-divergent changesets |
|
110 $ hg log -G |
|
111 @ 7:b28e84916d8c@default(draft) New message |
|
112 |\ |
|
113 +---o 6:551127da2a8a@default(public) merge |
|
114 | |/ |
|
115 | o 5:eeaf70969381@default(public) add _c |
|
116 | | |
|
117 | o 4:6612fc0ddeb6@default(public) add _b |
|
118 | | |
|
119 o | 3:154ad198ff4a@default(public) add _a |
|
120 |/ |
|
121 o 1:4d1169d82e47@default(public) modify a |
|
122 | |
|
123 o 0:d3873e73d99e@default(public) init |
|
124 |
|
125 $ hg evolve --all --phase-divergent |
|
126 skipping b28e84916d8c : we do not handle merge yet |
|