tests/test-evolve-abort-contentdiv.t
changeset 3832 fb821ed44f86
parent 3792 bb7d1616407f
child 3839 ac0717f23921
equal deleted inserted replaced
3831:987e335dbe11 3832:fb821ed44f86
   172   $ hg glog --hidden
   172   $ hg glog --hidden
   173   @  10:491e10505bae added c
   173   @  10:491e10505bae added c
   174   |   () draft
   174   |   () draft
   175   | x  9:7398f702a162 added c
   175   | x  9:7398f702a162 added c
   176   |/    () draft
   176   |/    () draft
   177   | o  8:2ba73e31f264 added c
   177   | *  8:2ba73e31f264 added c
   178   |/    () draft
   178   |/    () draft
   179   | *  7:f0f1694f123e added d
   179   | *  7:f0f1694f123e added d
   180   | |   () draft
   180   | |   () draft
   181   | | x  6:9c1631e352d9 added d
   181   | | x  6:9c1631e352d9 added d
   182   | |/    () draft
   182   | |/    () draft
   191   o  1:c7586e2a9264 added a
   191   o  1:c7586e2a9264 added a
   192   |   () draft
   192   |   () draft
   193   o  0:8fa14d15e168 added hgignore
   193   o  0:8fa14d15e168 added hgignore
   194       () draft
   194       () draft
   195 
   195 
   196 XXX: we need to strip off the obsmarker created 10 -> 8
       
   197   $ hg obslog -r . --all
   196   $ hg obslog -r . --all
   198   o    2ba73e31f264 (8) added c
   197   *  2ba73e31f264 (8) added c
   199   |\
   198   |
   200   @ |  491e10505bae (10) added c
   199   | @  491e10505bae (10) added c
   201   | |    rewritten as 2ba73e31f264 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
       
   202   | |
   200   | |
   203   x |  7398f702a162 (9) added c
   201   | x  7398f702a162 (9) added c
   204   |/     rewritten(content) as 491e10505bae using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   202   |/     rewritten(content) as 491e10505bae using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   205   |
   203   |
   206   x  ca1b80f7960a (3) added c
   204   x  ca1b80f7960a (3) added c
   207        rewritten(content) as 2ba73e31f264 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   205        rewritten(content) as 2ba73e31f264 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   208        rewritten(content) as 7398f702a162 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   206        rewritten(content) as 7398f702a162 using amend by test (Thu Jan 01 00:00:00 1970 +0000)