Mercurial Mercurial > mercurial / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-graft.t
changeset 30201 856ead835f56
parent 30197 0accd5a5ad04
child 30204 1894c830ee74
equal deleted inserted replaced
30200:a2804ddcf9ae 30201:856ead835f56 
   980 
   980 
   981 Test the cases A.0 (f4x) and A.6 (f3x)
 
   981 Test the cases A.0 (f4x) and A.6 (f3x)
 
   982 
   982 
   983   $ HGEDITOR="echo D1 >" hg graft -r 'desc("D0")' --edit
 
   983   $ HGEDITOR="echo D1 >" hg graft -r 'desc("D0")' --edit
 
   984   grafting 3:b69f5839d2d9 "D0"
 
   984   grafting 3:b69f5839d2d9 "D0"
 
       
   985   note: possible conflict - f3b was renamed multiple times to:
 
       
   986    f3d
 
       
   987    f3a
 
   985   warning: can't find ancestor for 'f3d' copied from 'f3b'!
 
   988   warning: can't find ancestor for 'f3d' copied from 'f3b'!
 
   986 
   989 
   987 Set up the repository for some further tests
 
   990 Set up the repository for some further tests
 
   988 
   991 
   989   $ hg up -q "min(desc("A0"))"
 
   992   $ hg up -q "min(desc("A0"))"
mercurial