Mercurial > hg
comparison tests/test-resolve.t @ 12314:f2daa6ab514a
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Without specifying the parent revision of the working copy, users will
update to tip, which is most likely the other head they were trying to
merge, not the revision they were at before the merge.
| author | Brodie Rao <brodie@bitheap.org> |
|---|---|
| date | Sun, 12 Sep 2010 18:05:53 -0500 |
| parents | a40372c1c731 |
| children | 4134686b83e1 |
comparison
equal
deleted
inserted
replaced
| 12313:2912881c2a98 | 12314:f2daa6ab514a |
|---|---|
| 21 | 21 |
| 22 failing merge | 22 failing merge |
| 23 | 23 |
| 24 $ HGMERGE=internal:fail hg merge | 24 $ HGMERGE=internal:fail hg merge |
| 25 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 25 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 26 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon | 26 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 27 | 27 |
| 28 $ echo resolved > file | 28 $ echo resolved > file |
| 29 $ hg resolve -m file | 29 $ hg resolve -m file |
| 30 $ hg commit -m 'resolved' | 30 $ hg commit -m 'resolved' |
| 31 | 31 |