equal
deleted
inserted
replaced
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 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 |
|
192 changeset 22bca4c721e5 backed out, don't forget to commit. |
192 $ hg locate b |
193 $ hg locate b |
193 b |
194 b |
194 $ hg update -C tip |
195 $ hg update -C tip |
195 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
196 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
196 $ hg locate b |
197 $ hg locate b |
322 adding file2 |
323 adding file2 |
323 |
324 |
324 without --merge |
325 without --merge |
325 $ hg backout -r 1 --tool=true |
326 $ hg backout -r 1 --tool=true |
326 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
327 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
328 changeset bf1602f437f3 backed out, don't forget to commit. |
327 $ hg branch |
329 $ hg branch |
328 branch2 |
330 branch2 |
329 $ hg status -A |
331 $ hg status -A |
330 R file1 |
332 R file1 |
331 C default |
333 C default |