tests/test-rename-dir-merge.t
changeset 13956 ffb5c09ba822
parent 12114 0a6b2e21bc86
child 15447 9910f60a37ee
equal deleted inserted replaced
13954:1184bb274cb3 13956:ffb5c09ba822
     1   $ mkdir t
     1   $ hg init t
     2   $ cd t
     2   $ cd t
     3   $ hg init
       
     4 
     3 
     5   $ mkdir a
     4   $ mkdir a
     6   $ echo foo > a/a
     5   $ echo foo > a/a
     7   $ echo bar > a/b
     6   $ echo bar > a/b
     8   $ hg ci -Am "0"
     7   $ hg ci -Am "0"
   116 
   115 
   117 
   116 
   118 Second scenario with two repos:
   117 Second scenario with two repos:
   119 
   118 
   120   $ cd ..
   119   $ cd ..
   121   $ mkdir r1
   120   $ hg init r1
   122   $ cd r1
   121   $ cd r1
   123   $ hg init
       
   124   $ mkdir a
   122   $ mkdir a
   125   $ echo foo > a/f
   123   $ echo foo > a/f
   126   $ hg add a
   124   $ hg add a
   127   adding a/f
   125   adding a/f
   128   $ hg ci -m "a/f == foo"
   126   $ hg ci -m "a/f == foo"