equal
deleted
inserted
replaced
296 |/ |
296 |/ |
297 o 6 feature-A: a nifty feature - test |
297 o 6 feature-A: a nifty feature - test |
298 | |
298 | |
299 o 0 : base - test |
299 o 0 : base - test |
300 |
300 |
301 $ hg stabilize --any |
301 $ hg stabilize --any --traceback |
302 latecomer not handled yet |
302 recreate:[8] another feature that rox |
303 [4] |
303 atop:[7] another feature |
|
304 computing new diff |
|
305 commited as 8d77fa12ab0c |
304 $ hg glog |
306 $ hg glog |
305 @ 8 feature-B: another feature that rox - test |
307 @ 9 feature-B: latecomer update to 5f4744038ed5: - test |
306 | |
308 | |
307 | o 7 : another feature - test |
309 o 7 : another feature - test |
308 |/ |
310 | |
309 o 6 feature-A: a nifty feature - test |
311 o 6 feature-A: a nifty feature - test |
310 | |
312 | |
311 o 0 : base - test |
313 o 0 : base - test |
312 |
314 |
|
315 $ hg diff -r 9 -r 8 |
|
316 $ hg diff -r 9^ -r 9 |
|
317 diff --git a/main-file-1 b/main-file-1 |
|
318 --- a/main-file-1 |
|
319 +++ b/main-file-1 |
|
320 @@ -3,1 +3,1 @@ |
|
321 -Zwei |
|
322 +deux |
313 |
323 |
314 $ cd .. |
324 $ cd .. |
315 |
325 |
316 enable general delta |
326 enable general delta |
317 |
327 |