tests/test-obsolete.t
changeset 33795 9dcc3529e002
parent 33794 6c1a9fd8361b
child 33797 ed99d3afef88
equal deleted inserted replaced
33794:6c1a9fd8361b 33795:9dcc3529e002
   525   branch: default
   525   branch: default
   526   commit: (clean)
   526   commit: (clean)
   527   update: 1 new changesets, 2 branch heads (merge)
   527   update: 1 new changesets, 2 branch heads (merge)
   528   phases: 3 draft
   528   phases: 3 draft
   529   orphan: 1 changesets
   529   orphan: 1 changesets
   530   $ hg log -G -r '::unstable()'
   530   $ hg log -G -r '::orphan()'
   531   @  5:cda648ca50f5 (draft orphan) [tip ] add original_e
   531   @  5:cda648ca50f5 (draft orphan) [tip ] add original_e
   532   |
   532   |
   533   x  4:94b33453f93b (draft *obsolete*) [ ] add original_d
   533   x  4:94b33453f93b (draft *obsolete*) [ ] add original_d
   534   |
   534   |
   535   o  3:6f9641995072 (draft) [ ] add n3w_3_c
   535   o  3:6f9641995072 (draft) [ ] add n3w_3_c
   908 Several troubles on the same changeset (create an unstable and bumped changeset)
   908 Several troubles on the same changeset (create an unstable and bumped changeset)
   909 
   909 
   910   $ hg debugobsolete `getid obsolete_e`
   910   $ hg debugobsolete `getid obsolete_e`
   911   obsoleted 1 changesets
   911   obsoleted 1 changesets
   912   $ hg debugobsolete `getid original_c` `getid babar`
   912   $ hg debugobsolete `getid original_c` `getid babar`
   913   $ hg log --config ui.logtemplate= -r 'bumped() and unstable()'
   913   $ hg log --config ui.logtemplate= -r 'bumped() and orphan()'
   914   changeset:   7:50c51b361e60
   914   changeset:   7:50c51b361e60
   915   user:        test
   915   user:        test
   916   date:        Thu Jan 01 00:00:00 1970 +0000
   916   date:        Thu Jan 01 00:00:00 1970 +0000
   917   instability: orphan, phase-divergent
   917   instability: orphan, phase-divergent
   918   summary:     add babar
   918   summary:     add babar
   923   $ hg log -r 'obsolete()'
   923   $ hg log -r 'obsolete()'
   924   6:3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e
   924   6:3de5eca88c00 (draft *obsolete*) [ ] add obsolete_e
   925 
   925 
   926 test the "troubles" templatekw
   926 test the "troubles" templatekw
   927 
   927 
   928   $ hg log -r 'bumped() and unstable()'
   928   $ hg log -r 'bumped() and orphan()'
   929   7:50c51b361e60 (draft orphan phase-divergent) [ ] add babar
   929   7:50c51b361e60 (draft orphan phase-divergent) [ ] add babar
   930 
   930 
   931 test the default cmdline template
   931 test the default cmdline template
   932 
   932 
   933   $ hg log -T default -r 'bumped()'
   933   $ hg log -T default -r 'bumped()'
   945   summary:     add obsolete_e
   945   summary:     add obsolete_e
   946   
   946   
   947 
   947 
   948 test summary output
   948 test summary output
   949 
   949 
   950   $ hg up -r 'bumped() and unstable()'
   950   $ hg up -r 'bumped() and orphan()'
   951   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   951   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   952   $ hg summary
   952   $ hg summary
   953   parent: 7:50c51b361e60  (orphan, phase-divergent)
   953   parent: 7:50c51b361e60  (orphan, phase-divergent)
   954    add babar
   954    add babar
   955   branch: default
   955   branch: default