tests/test-evolve-content-divergent-stack.t
changeset 5344 142827ad86f3
parent 5341 13376ca93fa3
child 5345 a73cdef2e33f
equal deleted inserted replaced
5343:ebfd0d875600 5344:142827ad86f3
   652   | |
   652   | |
   653   | x  changeset:   5:8e222f257bbf
   653   | x  changeset:   5:8e222f257bbf
   654   |/   parent:      0:8fa14d15e168
   654   |/   parent:      0:8fa14d15e168
   655   |    user:        test
   655   |    user:        test
   656   |    date:        Thu Jan 01 00:00:00 1970 +0000
   656   |    date:        Thu Jan 01 00:00:00 1970 +0000
   657   |    obsolete:    rewritten using evolve as 21:c68b60ab6619
   657   |    obsolete:    rebased using evolve as 21:c68b60ab6619
   658   |    summary:     watbar to a
   658   |    summary:     watbar to a
   659   |
   659   |
   660   o  changeset:   0:8fa14d15e168
   660   o  changeset:   0:8fa14d15e168
   661      user:        test
   661      user:        test
   662      date:        Thu Jan 01 00:00:00 1970 +0000
   662      date:        Thu Jan 01 00:00:00 1970 +0000
   664   
   664   
   665   $ hg obslog -r 'desc("watbar to a")' --all
   665   $ hg obslog -r 'desc("watbar to a")' --all
   666   o    c68b60ab6619 (21) watbar to a
   666   o    c68b60ab6619 (21) watbar to a
   667   |\
   667   |\
   668   x |  186bdc2cdfa2 (20) watbar to a
   668   x |  186bdc2cdfa2 (20) watbar to a
   669   | |    meta-changed(meta) as c68b60ab6619 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   669   | |    rewritten as c68b60ab6619 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   670   | |
   670   | |
   671   | x  c04ff147ef79 (10) added a
   671   | x  c04ff147ef79 (10) added a
   672   | |    rewritten(description, meta, content) as c68b60ab6619 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   672   | |    rewritten(description, content) as c68b60ab6619 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   673   | |
   673   | |
   674   x |  8e222f257bbf (5) watbar to a
   674   x |  8e222f257bbf (5) watbar to a
   675   |/     rebased(parent) as 186bdc2cdfa2 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   675   |/     rebased(parent) as 186bdc2cdfa2 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   676   |
   676   |
   677   x  c7586e2a9264 (1) added a
   677   x  c7586e2a9264 (1) added a