tests/test-obsolete.t
changeset 479 b63da0fb8ee5
parent 473 1f8f8dd75d18
child 480 cd1d5b7308be
equal deleted inserted replaced
478:13ccb68b728d 479:b63da0fb8ee5
   373   parent: 3:725c380fe99b 
   373   parent: 3:725c380fe99b 
   374    add obsol_c'
   374    add obsol_c'
   375   branch: default
   375   branch: default
   376   commit: 1 deleted, 2 unknown (clean)
   376   commit: 1 deleted, 2 unknown (clean)
   377   update: 4 new changesets, 4 branch heads (merge)
   377   update: 4 new changesets, 4 branch heads (merge)
       
   378   unstable: 1 changesets
       
   379   conflicting: 1 changesets
   378   $ qlog
   380   $ qlog
   379   6
   381   6
   380   - 909a0fb57e5d
   382   - 909a0fb57e5d
   381   3
   383   3
   382   - 725c380fe99b
   384   - 725c380fe99b
   629   parent: 14:50f11e5e3a63 tip
   631   parent: 14:50f11e5e3a63 tip
   630    add obsolet_conflicting_d
   632    add obsolet_conflicting_d
   631   branch: default
   633   branch: default
   632   commit: (clean)
   634   commit: (clean)
   633   update: 9 new changesets, 9 branch heads (merge)
   635   update: 9 new changesets, 9 branch heads (merge)
       
   636   latecomer: 1 changesets
   634   $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
   637   $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
   635   $ hg log -r 'conflicting()'
   638   $ hg log -r 'conflicting()'
   636   changeset:   14:50f11e5e3a63
   639   changeset:   14:50f11e5e3a63
   637   tag:         tip
   640   tag:         tip
   638   parent:      11:9468a5f5d8b2
   641   parent:      11:9468a5f5d8b2