tests/test-backout.t
changeset 20275 2123d27ff75d
parent 20270 0763d829cbea
child 20276 6545770bd379
equal deleted inserted replaced
20274:7a259dfe24f7 20275:2123d27ff75d
   186   commit: (clean)
   186   commit: (clean)
   187   update: (current)
   187   update: (current)
   188 
   188 
   189 without --merge
   189 without --merge
   190   $ hg backout -d '3 0' 1 --tool=true
   190   $ hg backout -d '3 0' 1 --tool=true
   191   reverting a
       
   192   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   191   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   193   $ hg locate b
   192   $ hg locate b
   194   b
   193   b
   195   $ hg update -C tip
   194   $ hg update -C tip
   196   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   195   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   322   $ hg ci -d '2 0' -Am file2
   321   $ hg ci -d '2 0' -Am file2
   323   adding file2
   322   adding file2
   324 
   323 
   325 without --merge
   324 without --merge
   326   $ hg backout -r 1 --tool=true
   325   $ hg backout -r 1 --tool=true
   327   removing file1
   326   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   328   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
   329   $ hg branch
   327   $ hg branch
   330   branch2
   328   branch2
   331   $ hg status -A
   329   $ hg status -A
   332   R file1
   330   R file1
   333   C default
   331   C default