tests/test-rename-merge1.t
changeset 42590 ab416b5d9b91
parent 42221 c83c08cf02b7
child 44161 d7622fdec3b5
equal deleted inserted replaced
42589:67bf11597eb8 42590:ab416b5d9b91
   182   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   182   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   183   (branch merge, don't forget to commit)
   183   (branch merge, don't forget to commit)
   184   $ hg status
   184   $ hg status
   185   M newfile
   185   M newfile
   186   $ cd ..
   186   $ cd ..
   187 
       
   188 Check that file is considered unrelated when deleted and recreated
       
   189 
       
   190   $ hg init unrelated
       
   191   $ cd unrelated
       
   192   $ echo foo > file
       
   193   $ hg add file
       
   194   $ hg commit -m "added file"
       
   195   $ hg cp file newfile
       
   196   $ hg commit -m "copy file"
       
   197   $ hg update 0
       
   198   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
       
   199   $ hg rm file
       
   200   $ hg commit -m "deleted file"
       
   201   created new head
       
   202   $ echo bar > file
       
   203   $ hg add file
       
   204   $ hg ci -m 'recreate file'
       
   205   $ hg log -G -T '{rev} {desc}\n'
       
   206   @  3 recreate file
       
   207   |
       
   208   o  2 deleted file
       
   209   |
       
   210   | o  1 copy file
       
   211   |/
       
   212   o  0 added file
       
   213   
       
   214 BROKEN: this is inconsistent with `hg merge` (below), which doesn't consider
       
   215 'file' renamed same since it was deleted for a while
       
   216   $ hg st --copies --rev 3 --rev 1
       
   217   M file
       
   218   A newfile
       
   219     file
       
   220   $ hg merge --debug 1
       
   221     unmatched files in other:
       
   222      newfile
       
   223     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
       
   224      src: 'file' -> dst: 'newfile' 
       
   225     checking for directory renames
       
   226   resolving manifests
       
   227    branchmerge: True, force: False, partial: False
       
   228    ancestor: 19d7f95df299, local: 4e4a42b1cbdf+, remote: 45b14aae7432
       
   229    newfile: remote created -> g
       
   230   getting newfile
       
   231   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
   232   (branch merge, don't forget to commit)
       
   233   $ hg status
       
   234   M newfile
       
   235   $ cd ..