tests/test-record
branchstable
changeset 11237 feb2a58fc592
parent 8811 8b35b08724eb
child 11238 a5922547b5cc
equal deleted inserted replaced
11236:cfa6a726ef6d 11237:feb2a58fc592
   295 y
   295 y
   296 y
   296 y
   297 EOF
   297 EOF
   298 echo; hg tip --config diff.git=True -p
   298 echo; hg tip --config diff.git=True -p
   299 
   299 
       
   300 cd ..
       
   301 
       
   302 echo % abort early when a merge is in progress
       
   303 hg up 4
       
   304 touch iwillmergethat
       
   305 hg add iwillmergethat
       
   306 hg branch thatbranch
       
   307 hg ci -m'new head'
       
   308 hg up default
       
   309 hg merge thatbranch
       
   310 echo; hg record -m'will abort'
       
   311 hg up -C
   300 
   312 
   301 echo % with win32ext
   313 echo % with win32ext
   302 cd ..
       
   303 echo '[extensions]' >> .hg/hgrc
   314 echo '[extensions]' >> .hg/hgrc
   304 echo 'win32text = ' >> .hg/hgrc
   315 echo 'win32text = ' >> .hg/hgrc
   305 echo '[decode]' >> .hg/hgrc
   316 echo '[decode]' >> .hg/hgrc
   306 echo '** = cleverdecode:' >> .hg/hgrc
   317 echo '** = cleverdecode:' >> .hg/hgrc
   307 echo '[encode]' >> .hg/hgrc
   318 echo '[encode]' >> .hg/hgrc