|
1 $ cat >> $HGRCPATH <<EOF |
|
2 > [defaults] |
|
3 > amend=-d "0 0" |
|
4 > [extensions] |
|
5 > hgext.graphlog= |
|
6 > EOF |
|
7 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH |
|
8 |
|
9 $ glog() { |
|
10 > hg glog --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n' "$@" |
|
11 > } |
|
12 |
|
13 $ hg init repo |
|
14 $ cd repo |
|
15 $ echo root > root |
|
16 $ hg ci -Am addroot |
|
17 adding root |
|
18 $ echo a > a |
|
19 $ hg ci -Am adda |
|
20 adding a |
|
21 $ echo b > b |
|
22 $ hg ci -Am addb |
|
23 adding b |
|
24 $ echo c > c |
|
25 $ hg ci -Am addc |
|
26 adding c |
|
27 $ glog |
|
28 @ 3:7a7552255fb5@default(draft) addc |
|
29 | |
|
30 o 2:ef23d6ef94d6@default(draft) addb |
|
31 | |
|
32 o 1:93418d2c0979@default(draft) adda |
|
33 | |
|
34 o 0:c471ef929e6a@default(draft) addroot |
|
35 |
|
36 $ hg gdown |
|
37 gdown have been deprecated in favor of previous |
|
38 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
39 [2] addb |
|
40 $ echo b >> b |
|
41 $ hg amend |
|
42 1 new unstable changesets |
|
43 $ hg gdown |
|
44 gdown have been deprecated in favor of previous |
|
45 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
46 [1] adda |
|
47 $ echo a >> a |
|
48 $ hg amend |
|
49 1 new unstable changesets |
|
50 $ glog |
|
51 @ 7:005fe5914f78@default(draft) adda |
|
52 | |
|
53 | o 5:22619daeed78@default(draft) addb |
|
54 | | |
|
55 | | o 3:7a7552255fb5@default(draft) addc |
|
56 | | | |
|
57 | | x 2:ef23d6ef94d6@default(draft) addb |
|
58 | |/ |
|
59 | x 1:93418d2c0979@default(draft) adda |
|
60 |/ |
|
61 o 0:c471ef929e6a@default(draft) addroot |
|
62 |
|
63 |
|
64 Test stabilizing a predecessor child |
|
65 |
|
66 $ hg evolve -v |
|
67 move:[5] addb |
|
68 atop:[7] adda |
|
69 hg rebase -r 22619daeed78 -d 005fe5914f78 |
|
70 resolving manifests |
|
71 getting b |
|
72 committing files: |
|
73 b |
|
74 committing manifest |
|
75 committing changelog |
|
76 working directory is now at 81b8bbcd5892 |
|
77 $ glog |
|
78 @ 8:81b8bbcd5892@default(draft) addb |
|
79 | |
|
80 o 7:005fe5914f78@default(draft) adda |
|
81 | |
|
82 | o 3:7a7552255fb5@default(draft) addc |
|
83 | | |
|
84 | x 2:ef23d6ef94d6@default(draft) addb |
|
85 | | |
|
86 | x 1:93418d2c0979@default(draft) adda |
|
87 |/ |
|
88 o 0:c471ef929e6a@default(draft) addroot |
|
89 |
|
90 |
|
91 Test stabilizing a descendant predecessor's child |
|
92 |
|
93 $ hg up 7 |
|
94 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
95 $ hg debugobsolete > successors.old |
|
96 $ hg evolve -v |
|
97 move:[3] addc |
|
98 atop:[8] addb |
|
99 hg rebase -r 7a7552255fb5 -d 81b8bbcd5892 |
|
100 resolving manifests |
|
101 getting b |
|
102 resolving manifests |
|
103 getting c |
|
104 committing files: |
|
105 c |
|
106 committing manifest |
|
107 committing changelog |
|
108 working directory is now at 0f691739f917 |
|
109 $ hg debugobsolete > successors.new |
|
110 $ diff -u successors.old successors.new |
|
111 --- successors.old* (glob) |
|
112 +++ successors.new* (glob) |
|
113 @@ -3,3 +3,4 @@ |
|
114 93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 (*) {'user': 'test'} (glob) |
|
115 7a7d76dc97c57751de9e80f61ed2a639bd03cd24 0 {93418d2c0979643ad446f621195e78720edb05b4} (*) {'user': 'test'} (glob) |
|
116 22619daeed78036f80fbd326b6852519c4f0c25e 81b8bbcd5892841efed41433d7a5e9df922396cb 0 (*) {'user': 'test'} (glob) |
|
117 +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 0f691739f91762462bf8ba21f35fdf71fe64310e 0 (*) {'user': 'test'} (glob) |
|
118 [1] |
|
119 |
|
120 |
|
121 |
|
122 $ glog |
|
123 @ 9:0f691739f917@default(draft) addc |
|
124 | |
|
125 o 8:81b8bbcd5892@default(draft) addb |
|
126 | |
|
127 o 7:005fe5914f78@default(draft) adda |
|
128 | |
|
129 o 0:c471ef929e6a@default(draft) addroot |
|
130 |
|
131 $ hg evolve -v |
|
132 no troubled changesets |
|
133 [1] |
|
134 |
|
135 Test behavior with --any |
|
136 |
|
137 $ hg up 8 |
|
138 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
139 $ echo b >> b |
|
140 $ hg amend |
|
141 1 new unstable changesets |
|
142 $ glog |
|
143 @ 11:7a68bc4596ea@default(draft) addb |
|
144 | |
|
145 | o 9:0f691739f917@default(draft) addc |
|
146 | | |
|
147 | x 8:81b8bbcd5892@default(draft) addb |
|
148 |/ |
|
149 o 7:005fe5914f78@default(draft) adda |
|
150 | |
|
151 o 0:c471ef929e6a@default(draft) addroot |
|
152 |
|
153 $ hg up 9 |
|
154 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
155 $ hg evolve -v |
|
156 nothing to evolve on current working copy parent |
|
157 (1 other unstable in the repository, do you want --any or --rev) |
|
158 [2] |
|
159 $ hg evolve --any -v |
|
160 move:[9] addc |
|
161 atop:[11] addb |
|
162 hg rebase -r 0f691739f917 -d 7a68bc4596ea |
|
163 resolving manifests |
|
164 removing c |
|
165 getting b |
|
166 resolving manifests |
|
167 getting c |
|
168 committing files: |
|
169 c |
|
170 committing manifest |
|
171 committing changelog |
|
172 working directory is now at 2256dae6521f |
|
173 $ glog |
|
174 @ 12:2256dae6521f@default(draft) addc |
|
175 | |
|
176 o 11:7a68bc4596ea@default(draft) addb |
|
177 | |
|
178 o 7:005fe5914f78@default(draft) adda |
|
179 | |
|
180 o 0:c471ef929e6a@default(draft) addroot |
|
181 |
|
182 $ hg evolve --any -v |
|
183 no unstable changesets to evolve |
|
184 [1] |
|
185 |
|
186 Ambiguous evolution |
|
187 $ echo a > k |
|
188 $ hg add k |
|
189 $ hg ci -m firstambiguous |
|
190 $ hg up .^ |
|
191 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
192 $ echo a > l |
|
193 $ hg add l |
|
194 $ hg ci -m secondambiguous |
|
195 created new head |
|
196 $ hg up .^ |
|
197 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
198 $ hg commit --amend -m "newmessage" |
|
199 2 new unstable changesets |
|
200 $ hg log -G |
|
201 @ changeset: 15:f83a0bce03e4 |
|
202 | tag: tip |
|
203 | parent: 11:7a68bc4596ea |
|
204 | user: test |
|
205 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
206 | summary: newmessage |
|
207 | |
|
208 | o changeset: 14:fa68011f392e |
|
209 | | parent: 12:2256dae6521f |
|
210 | | user: test |
|
211 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
212 | | trouble: unstable |
|
213 | | summary: secondambiguous |
|
214 | | |
|
215 | | o changeset: 13:bdc003b6eec2 |
|
216 | |/ user: test |
|
217 | | date: Thu Jan 01 00:00:00 1970 +0000 |
|
218 | | trouble: unstable |
|
219 | | summary: firstambiguous |
|
220 | | |
|
221 | x changeset: 12:2256dae6521f |
|
222 |/ user: test |
|
223 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
224 | summary: addc |
|
225 | |
|
226 o changeset: 11:7a68bc4596ea |
|
227 | parent: 7:005fe5914f78 |
|
228 | user: test |
|
229 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
230 | summary: addb |
|
231 | |
|
232 o changeset: 7:005fe5914f78 |
|
233 | parent: 0:c471ef929e6a |
|
234 | user: test |
|
235 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
236 | summary: adda |
|
237 | |
|
238 o changeset: 0:c471ef929e6a |
|
239 user: test |
|
240 date: Thu Jan 01 00:00:00 1970 +0000 |
|
241 summary: addroot |
|
242 |
|
243 $ hg evolve |
|
244 abort: multiple evolve candidates |
|
245 (select one of *, * with --rev) (glob) |
|
246 [255] |
|
247 |
|
248 |
|
249 |