tests/test-obsolete-distributed.t
changeset 34661 eb586ed5d8ce
parent 34651 e88dbbcf2a56
child 34847 e27f1f04c2cf
equal deleted inserted replaced
34660:d00ec62d156f 34661:eb586ed5d8ce
   149   adding manifests
   149   adding manifests
   150   adding file changes
   150   adding file changes
   151   added 1 changesets with 1 changes to 1 files (+1 heads)
   151   added 1 changesets with 1 changes to 1 files (+1 heads)
   152   1 new obsolescence markers
   152   1 new obsolescence markers
   153   obsoleted 1 changesets
   153   obsoleted 1 changesets
       
   154   new changesets 391a2bf12b1b
   154   (run 'hg heads' to see heads)
   155   (run 'hg heads' to see heads)
   155   $ hg log -G
   156   $ hg log -G
   156   o  4:391a2bf12b1b c_B1
   157   o  4:391a2bf12b1b c_B1
   157   |
   158   |
   158   @  0:e82fb8d02bbf ROOT
   159   @  0:e82fb8d02bbf ROOT
   275   searching for changes
   276   searching for changes
   276   adding changesets
   277   adding changesets
   277   adding manifests
   278   adding manifests
   278   adding file changes
   279   adding file changes
   279   added 2 changesets with 2 changes to 2 files
   280   added 2 changesets with 2 changes to 2 files
       
   281   new changesets d33b0a3a6464:ef908e42ce65
   280   (run 'hg update' to get a working copy)
   282   (run 'hg update' to get a working copy)
   281   $ hg up 'desc("c_A")'
   283   $ hg up 'desc("c_A")'
   282   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   284   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   283   $ hg commit --amend -m 'c_A1'
   285   $ hg commit --amend -m 'c_A1'
   284   $ hg rebase -r 'desc("c_B0")' -d . # no easy way to rewrite the message with the rebase
   286   $ hg rebase -r 'desc("c_B0")' -d . # no easy way to rewrite the message with the rebase
   321   adding changesets
   323   adding changesets
   322   adding manifests
   324   adding manifests
   323   adding file changes
   325   adding file changes
   324   added 2 changesets with 2 changes to 2 files
   326   added 2 changesets with 2 changes to 2 files
   325   3 new obsolescence markers
   327   3 new obsolescence markers
       
   328   new changesets 5b5708a437f2:956063ac4557
   326   (run 'hg update' to get a working copy)
   329   (run 'hg update' to get a working copy)
   327   $ hg up 'desc("c_A")'
   330   $ hg up 'desc("c_A")'
   328   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   331   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   329   $ hg commit --amend -m 'c_A2'
   332   $ hg commit --amend -m 'c_A2'
   330   $ hg rebase -r 'desc("c_B1")' -d . # no easy way to rewrite the message with the rebase
   333   $ hg rebase -r 'desc("c_B1")' -d . # no easy way to rewrite the message with the rebase
   390   adding manifests
   393   adding manifests
   391   adding file changes
   394   adding file changes
   392   added 2 changesets with 0 changes to 2 files (+1 heads)
   395   added 2 changesets with 0 changes to 2 files (+1 heads)
   393   6 new obsolescence markers
   396   6 new obsolescence markers
   394   obsoleted 2 changesets
   397   obsoleted 2 changesets
       
   398   new changesets 9866d64649a5:77ae25d99ff0
   395   (run 'hg heads' to see heads)
   399   (run 'hg heads' to see heads)
   396   $ hg debugobsolete
   400   $ hg debugobsolete
   397   3cf8de21cc2282186857d2266eb6b1f9cb85ecf3 77ae25d99ff07889e181126b1171b94bec8e5227 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'celeste'}
   401   3cf8de21cc2282186857d2266eb6b1f9cb85ecf3 77ae25d99ff07889e181126b1171b94bec8e5227 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'celeste'}
   398   5b5708a437f27665db42c5a261a539a1bcb2a8c2 9866d64649a5d9c5991fe119c7b2c33898114e10 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'celeste'}
   402   5b5708a437f27665db42c5a261a539a1bcb2a8c2 9866d64649a5d9c5991fe119c7b2c33898114e10 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'celeste'}
   399   5ffb9e311b35f6ab6f76f667ca5d6e595645481b 956063ac4557828781733b2d5677a351ce856f59 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'bob'}
   403   5ffb9e311b35f6ab6f76f667ca5d6e595645481b 956063ac4557828781733b2d5677a351ce856f59 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'bob'}