tests/test-fetch
changeset 9093 0b2b269ba3d0
parent 7855 aa1a87f7544f
child 9121 a85a3d398cc3
equal deleted inserted replaced
9089:8ec39725d966 9093:0b2b269ba3d0
   183 hg clone ib1 ib2
   183 hg clone ib1 ib2
   184 echo % fetch should succeed
   184 echo % fetch should succeed
   185 hg --cwd ib2 fetch ../ib1
   185 hg --cwd ib2 fetch ../ib1
   186 rm -fr ib1 ib2
   186 rm -fr ib1 ib2
   187 
   187 
       
   188 echo % test issue1726
       
   189 hg init i1726r1
       
   190 echo a > i1726r1/a
       
   191 hg --cwd i1726r1 ci -Am base
       
   192 hg clone i1726r1 i1726r2
       
   193 echo b > i1726r1/a
       
   194 hg --cwd i1726r1 ci -m second
       
   195 echo c > i1726r2/a
       
   196 hg --cwd i1726r2 ci -m third
       
   197 HGMERGE=true hg --cwd i1726r2 fetch ../i1726r1 | sed 's/new changeset 3:[0-9a-zA-Z]\+/new changeset 3/'
       
   198 hg --cwd i1726r2 heads default --template '{rev}\n'
       
   199 
   188 "$TESTDIR/killdaemons.py"
   200 "$TESTDIR/killdaemons.py"
   189 
   201 
   190 true
   202 true