tests/test-fold.t
branchmercurial-4.7
changeset 5367 cb5983c0287f
parent 5162 a7fb433faab6
parent 5349 e8660b28bfee
equal deleted inserted replaced
5283:02cc51ca6795 5367:cb5983c0287f
    98   $ hg debugobsolete -r 'desc("r5")' --exclusive
    98   $ hg debugobsolete -r 'desc("r5")' --exclusive
    99   4de32a90b66cd083ebf3c00b41277aa7abca51dd 198b5c405d01a50c41a81a00fc61677b81981a5f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '37', 'operation': 'fold', 'user': 'test'}
    99   4de32a90b66cd083ebf3c00b41277aa7abca51dd 198b5c405d01a50c41a81a00fc61677b81981a5f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '37', 'operation': 'fold', 'user': 'test'}
   100   c8d03c1b5e94af74b772900c58259d2e08917735 198b5c405d01a50c41a81a00fc61677b81981a5f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '33', 'operation': 'fold', 'user': 'test'}
   100   c8d03c1b5e94af74b772900c58259d2e08917735 198b5c405d01a50c41a81a00fc61677b81981a5f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '33', 'operation': 'fold', 'user': 'test'}
   101   f69452c5b1af6cbaaa56ef50cf94fff5bcc6ca23 198b5c405d01a50c41a81a00fc61677b81981a5f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '37', 'operation': 'fold', 'user': 'test'}
   101   f69452c5b1af6cbaaa56ef50cf94fff5bcc6ca23 198b5c405d01a50c41a81a00fc61677b81981a5f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '37', 'operation': 'fold', 'user': 'test'}
   102 
   102 
       
   103   $ hg obslog --no-origin
       
   104   @    198b5c405d01 (11) r5
       
   105   |\
       
   106   | \
       
   107   | |\
       
   108   x | |  4de32a90b66c (7) r7
       
   109    / /     rewritten(description, date, parent) as 198b5c405d01 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
       
   110   | |
       
   111   x |  c8d03c1b5e94 (5) r5
       
   112    /     rewritten(description, date) as 198b5c405d01 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
       
   113   |
       
   114   x  f69452c5b1af (6) r6
       
   115        rewritten(description, date, parent) as 198b5c405d01 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
       
   116   
       
   117   $ hg obslog
       
   118   @    198b5c405d01 (11) r5
       
   119   |\     rewritten(description, date, parent) from 4de32a90b66c using fold by test (Thu Jan 01 00:00:00 1970 +0000)
       
   120   | |    rewritten(description, date) from c8d03c1b5e94 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
       
   121   | |    rewritten(description, date, parent) from f69452c5b1af using fold by test (Thu Jan 01 00:00:00 1970 +0000)
       
   122   | |
       
   123   | \
       
   124   | |\
       
   125   x | |  4de32a90b66c (7) r7
       
   126    / /
       
   127   x /  c8d03c1b5e94 (5) r5
       
   128    /
       
   129   x  f69452c5b1af (6) r6
       
   130   
       
   131 
   103 Checking whether the bookmarks are moved or not
   132 Checking whether the bookmarks are moved or not
   104 
   133 
   105   $ hg log -G
   134   $ hg log -G
   106   @  11 - 198b5c405d01 r5 [debugbuilddag] (draft) bm1
   135   @  11 - 198b5c405d01 r5 [debugbuilddag] (draft) bm1
   107   |
   136   |