Mercurial > hg
view tests/test-imerge.out @ 6109:242595e612ed
revert: unify forget and remove lists
This doesn't make a difference right now, but after the next revision
some files in state 'a' may end up in the deleted list, and revert
won't be able to just remove all files in that list.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Thu, 14 Feb 2008 18:08:16 -0200 |
parents | 9cd6578750b9 |
children | 5c5e45766224 |
line wrap: on
line source
adding bar adding foo 1 files updated, 0 files merged, 1 files removed, 0 files unresolved % start imerge 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) U foo foo bar bar bar % status -v merging e6da46716401 and 30d266f502e7 U foo (foo2) % next foo % merge next merging foo and foo2 all conflicts resolved % unresolve % merge foo merging foo and foo2 all conflicts resolved % save % load 2 files updated, 0 files merged, 1 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) R foo all conflicts resolved foo changeset: 3:fa9a6defdcaf tag: tip parent: 2:e6da46716401 parent: 1:30d266f502e7 user: test date: Thu Jan 01 00:00:03 1970 +0000 files: foo foo2 description: merged % nothing to merge -- tip abort: there is nothing to merge 2 files updated, 0 files merged, 1 files removed, 0 files unresolved % nothing to merge abort: there is nothing to merge - use "hg update" instead