Mercurial > hg
comparison tests/test-merge9.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 | 56d9b73487ff |
| children | 4134686b83e1 |
comparison
equal
deleted
inserted
replaced
| 12313:2912881c2a98 | 12314:f2daa6ab514a |
|---|---|
| 28 $ HGMERGE=false hg merge | 28 $ HGMERGE=false hg merge |
| 29 merging bar | 29 merging bar |
| 30 merging bar failed! | 30 merging bar failed! |
| 31 merging foo and baz to baz | 31 merging foo and baz to baz |
| 32 1 files updated, 1 files merged, 0 files removed, 1 files unresolved | 32 1 files updated, 1 files merged, 0 files removed, 1 files unresolved |
| 33 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon | 33 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 34 $ hg resolve -l | 34 $ hg resolve -l |
| 35 U bar | 35 U bar |
| 36 R baz | 36 R baz |
| 37 | 37 |
| 38 test with the rename on the local side | 38 test with the rename on the local side |
| 41 $ HGMERGE=false hg merge | 41 $ HGMERGE=false hg merge |
| 42 merging bar | 42 merging bar |
| 43 merging bar failed! | 43 merging bar failed! |
| 44 merging baz and foo to baz | 44 merging baz and foo to baz |
| 45 1 files updated, 1 files merged, 0 files removed, 1 files unresolved | 45 1 files updated, 1 files merged, 0 files removed, 1 files unresolved |
| 46 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon | 46 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 47 | 47 |
| 48 show unresolved | 48 show unresolved |
| 49 $ hg resolve -l | 49 $ hg resolve -l |
| 50 U bar | 50 U bar |
| 51 R baz | 51 R baz |