equal
deleted
inserted
replaced
74 $ hg --hidden shortlog -G -r 3: |
74 $ hg --hidden shortlog -G -r 3: |
75 x 4:a3e0ef24aaf0 draft debug hack |
75 x 4:a3e0ef24aaf0 draft debug hack |
76 | |
76 | |
77 @ 3:934359450037 draft implement feature Y |
77 @ 3:934359450037 draft implement feature Y |
78 | |
78 | |
|
79 ~ |
79 |
80 |
80 example 5: uncommit files at head (figure 4) |
81 example 5: uncommit files at head (figure 4) |
81 $ echo 'relevant' >> file1.c |
82 $ echo 'relevant' >> file1.c |
82 $ echo 'irrelevant' >> file2.c |
83 $ echo 'irrelevant' >> file2.c |
83 $ hg commit -u dan -d '10 0' -m 'fix bug 234' |
84 $ hg commit -u dan -d '10 0' -m 'fix bug 234' |
89 | |
90 | |
90 | x 5:da4331967f5f draft fix bug 234 |
91 | x 5:da4331967f5f draft fix bug 234 |
91 |/ |
92 |/ |
92 o 3:934359450037 draft implement feature Y |
93 o 3:934359450037 draft implement feature Y |
93 | |
94 | |
|
95 ~ |
94 $ hg parents --template '{rev}:{node|short} {desc|firstline}\n{files}\n' |
96 $ hg parents --template '{rev}:{node|short} {desc|firstline}\n{files}\n' |
95 6:c8defeecf7a4 fix bug 234 |
97 6:c8defeecf7a4 fix bug 234 |
96 file1.c |
98 file1.c |
97 $ hg revert --no-backup file2.c |
99 $ hg revert --no-backup file2.c |
98 |
100 |
119 | | |
121 | | |
120 | x 7:05e61aab8294 draft step 1 |
122 | x 7:05e61aab8294 draft step 1 |
121 |/ |
123 |/ |
122 o 6:c8defeecf7a4 draft fix bug 234 |
124 o 6:c8defeecf7a4 draft fix bug 234 |
123 | |
125 | |
|
126 ~ |
124 $ hg --hidden log -q -r 'successors(7) | successors(8) | successors(9)' |
127 $ hg --hidden log -q -r 'successors(7) | successors(8) | successors(9)' |
125 10:171c6a79a27b |
128 10:171c6a79a27b |
126 $ hg --hidden log -q -r 'precursors(10)' |
129 $ hg --hidden log -q -r 'precursors(10)' |
127 7:05e61aab8294 |
130 7:05e61aab8294 |
128 8:be6d5bc8e4cc |
131 8:be6d5bc8e4cc |
154 | |
157 | |
155 o 11:3e1cb8f70c02 draft fix bug 17 |
158 o 11:3e1cb8f70c02 draft fix bug 17 |
156 | |
159 | |
157 o 10:171c6a79a27b draft fix bug 64 |
160 o 10:171c6a79a27b draft fix bug 64 |
158 | |
161 | |
|
162 ~ |
159 |
163 |
160 example 7: amend an older changeset (figures 6, 7) |
164 example 7: amend an older changeset (figures 6, 7) |
161 $ hg update -q 11 |
165 $ hg update -q 11 |
162 $ echo 'fix fix fix fix' > file2.c |
166 $ echo 'fix fix fix fix' > file2.c |
163 $ hg amend -u bob -d '6 0' |
167 $ hg amend -u bob -d '6 0' |
178 | |/ |
182 | |/ |
179 | x 11:3e1cb8f70c02 draft fix bug 17 |
183 | x 11:3e1cb8f70c02 draft fix bug 17 |
180 |/ |
184 |/ |
181 o 10:171c6a79a27b draft fix bug 64 |
185 o 10:171c6a79a27b draft fix bug 64 |
182 | |
186 | |
|
187 ~ |
183 $ hg evolve -q --all |
188 $ hg evolve -q --all |
184 $ hg shortlog -G -r 10:: |
189 $ hg shortlog -G -r 10:: |
185 @ 17:91b4b0f8b5c5 draft feature 23 |
190 @ 17:91b4b0f8b5c5 draft feature 23 |
186 | |
191 | |
187 o 16:fe8858bd9bc2 draft cleanup |
192 o 16:fe8858bd9bc2 draft cleanup |
188 | |
193 | |
189 o 15:395cbeda3a06 draft fix bug 17 |
194 o 15:395cbeda3a06 draft fix bug 17 |
190 | |
195 | |
191 o 10:171c6a79a27b draft fix bug 64 |
196 o 10:171c6a79a27b draft fix bug 64 |
192 | |
197 | |
|
198 ~ |
193 |
199 |
194 setup for example 8: prune an older changeset (figure 8) |
200 setup for example 8: prune an older changeset (figure 8) |
195 $ echo 'useful' >> file1.c |
201 $ echo 'useful' >> file1.c |
196 $ hg commit -u carl -d '7 0' -m 'useful work' |
202 $ hg commit -u carl -d '7 0' -m 'useful work' |
197 $ echo 'debug' >> file2.c |
203 $ echo 'debug' >> file2.c |
205 | |
211 | |
206 o 18:1f33e68b18b9 draft useful work |
212 o 18:1f33e68b18b9 draft useful work |
207 | |
213 | |
208 o 17:91b4b0f8b5c5 draft feature 23 |
214 o 17:91b4b0f8b5c5 draft feature 23 |
209 | |
215 | |
|
216 ~ |
210 |
217 |
211 example 8: prune an older changeset (figures 8, 9) |
218 example 8: prune an older changeset (figures 8, 9) |
212 $ hg prune 19 |
219 $ hg prune 19 |
213 1 changesets pruned |
220 1 changesets pruned |
214 1 new unstable changesets |
221 1 new unstable changesets |
217 | |
224 | |
218 x 19:b23d06b457a8 draft debug hack |
225 x 19:b23d06b457a8 draft debug hack |
219 | |
226 | |
220 o 18:1f33e68b18b9 draft useful work |
227 o 18:1f33e68b18b9 draft useful work |
221 | |
228 | |
|
229 ~ |
222 $ hg evolve -q --all --any |
230 $ hg evolve -q --all --any |
223 $ hg --hidden shortlog -G -r 18:: |
231 $ hg --hidden shortlog -G -r 18:: |
224 @ 21:4393e5877437 draft more work |
232 @ 21:4393e5877437 draft more work |
225 | |
233 | |
226 | x 20:ea8fafca914b draft more work |
234 | x 20:ea8fafca914b draft more work |
227 | | |
235 | | |
228 | x 19:b23d06b457a8 draft debug hack |
236 | x 19:b23d06b457a8 draft debug hack |
229 |/ |
237 |/ |
230 o 18:1f33e68b18b9 draft useful work |
238 o 18:1f33e68b18b9 draft useful work |
231 | |
239 | |
|
240 ~ |
232 |
241 |
233 example 9: uncommit files from an older changeset (discard changes) |
242 example 9: uncommit files from an older changeset (discard changes) |
234 (figure 10) |
243 (figure 10) |
235 $ echo 'this fixes bug 53' >> file1.c |
244 $ echo 'this fixes bug 53' >> file1.c |
236 $ echo 'debug hack' >> file2.c |
245 $ echo 'debug hack' >> file2.c |
244 | |
253 | |
245 @ 22:f84357446753 draft fix bug 53 |
254 @ 22:f84357446753 draft fix bug 53 |
246 | |
255 | |
247 o 21:4393e5877437 draft more work |
256 o 21:4393e5877437 draft more work |
248 | |
257 | |
|
258 ~ |
249 $ hg uncommit file2.c |
259 $ hg uncommit file2.c |
250 1 new unstable changesets |
260 1 new unstable changesets |
251 $ hg status |
261 $ hg status |
252 M file2.c |
262 M file2.c |
253 $ hg revert file2.c |
263 $ hg revert file2.c |
264 | | |
274 | | |
265 | x 22:f84357446753 draft fix bug 53 |
275 | x 22:f84357446753 draft fix bug 53 |
266 |/ |
276 |/ |
267 o 21:4393e5877437 draft more work |
277 o 21:4393e5877437 draft more work |
268 | |
278 | |
|
279 ~ |
269 $ rm file2.c.orig |
280 $ rm file2.c.orig |
270 |
281 |
271 example 10: uncommit files from an older changeset (keep changes) |
282 example 10: uncommit files from an older changeset (keep changes) |
272 (figures 11, 12) |
283 (figures 11, 12) |
273 $ echo 'fix a bug' >> file1.c |
284 $ echo 'fix a bug' >> file1.c |
282 | |
293 | |
283 @ 26:5b31a1239ab9 draft fix a bug |
294 @ 26:5b31a1239ab9 draft fix a bug |
284 | |
295 | |
285 o 25:0d972d6888e6 draft fix bug 67 |
296 o 25:0d972d6888e6 draft fix bug 67 |
286 | |
297 | |
|
298 ~ |
287 $ hg uncommit file2.c |
299 $ hg uncommit file2.c |
288 1 new unstable changesets |
300 1 new unstable changesets |
289 $ hg status |
301 $ hg status |
290 M file2.c |
302 M file2.c |
291 $ hg commit -m 'useful tweak' |
303 $ hg commit -m 'useful tweak' |
298 | | |
310 | | |
299 | x 26:5b31a1239ab9 draft fix a bug |
311 | x 26:5b31a1239ab9 draft fix a bug |
300 |/ |
312 |/ |
301 o 25:0d972d6888e6 draft fix bug 67 |
313 o 25:0d972d6888e6 draft fix bug 67 |
302 | |
314 | |
|
315 ~ |
303 $ hg evolve --all --any |
316 $ hg evolve --all --any |
304 move:[27] new feature |
317 move:[27] new feature |
305 atop:[28] fix a bug |
318 atop:[28] fix a bug |
306 working directory is now at 166c1c368ab6 |
319 working directory is now at 166c1c368ab6 |
307 $ hg --hidden shortlog -G -r 25:: |
320 $ hg --hidden shortlog -G -r 25:: |
315 | | |
328 | | |
316 | x 26:5b31a1239ab9 draft fix a bug |
329 | x 26:5b31a1239ab9 draft fix a bug |
317 |/ |
330 |/ |
318 o 25:0d972d6888e6 draft fix bug 67 |
331 o 25:0d972d6888e6 draft fix bug 67 |
319 | |
332 | |
|
333 ~ |