284 $ echo 'babar' > toto |
284 $ echo 'babar' > toto |
285 $ hg add toto |
285 $ hg add toto |
286 $ hg ci -m 'babar is not dead' |
286 $ hg ci -m 'babar is not dead' |
287 $ echo '[ui]' >> .hg/hgrc |
287 $ echo '[ui]' >> .hg/hgrc |
288 $ echo 'logtemplate={rev} {node|short} {desc|firstline}\n' >> .hg/hgrc |
288 $ echo 'logtemplate={rev} {node|short} {desc|firstline}\n' >> .hg/hgrc |
289 $ hg pull --rebase --traceback |
289 $ hg pull --rebase --traceback | grep -v 'saved' |
290 pulling from $TESTTMP/repo |
290 pulling from $TESTTMP/repo |
291 searching for changes |
291 searching for changes |
292 adding changesets |
292 adding changesets |
293 adding manifests |
293 adding manifests |
294 adding file changes |
294 adding file changes |
295 added 5 changesets with 5 changes to 5 files (+4 heads) |
295 added 5 changesets with 5 changes to 5 files (+4 heads) |
296 saved backup bundle to $TESTTMP/other/.hg/strip-backup/2a6c62a1b55d-backup.hg |
|
297 $ hg glog |
296 $ hg glog |
298 @ 7 d5567dbec794 babar is not dead |
297 @ [78] d5567dbec794 babar is not dead (re) |
299 | |
298 | |
300 o 6 1951ead97108 appendab |
299 o [67] 1951ead97108 appendab (re) |
301 | |
300 | |
302 o 5 03f165c84ea8 addd |
301 o [56] 03f165c84ea8 addd (re) |
303 | |
302 | |
304 | o 4 a7773ffa7edc Collapsed revision |
303 | o [45] a7773ffa7edc Collapsed revision (re) |
305 |/ |
304 |/ |
306 | o 3 9c5494949763 adde |
305 | o [34] 9c5494949763 adde (re) |
307 |/ |
306 |/ |
308 | o 2 102a90ea7b4a addb |
307 | o [23] 102a90ea7b4a addb (re) |
309 | | |
308 | | |
310 o | 1 540395c44225 changea |
309 o | 1 540395c44225 changea |
311 |/ |
310 |/ |
312 o 0 07f494440405 adda |
311 o 0 07f494440405 adda |
313 |
312 |