Mercurial > hg
comparison tests/test-log.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 | cd7182358d9f |
| children | 4134686b83e1 |
comparison
equal
deleted
inserted
replaced
| 12313:2912881c2a98 | 12314:f2daa6ab514a |
|---|---|
| 896 $ hg merge 7 | 896 $ hg merge 7 |
| 897 merging foo | 897 merging foo |
| 898 warning: conflicts during merge. | 898 warning: conflicts during merge. |
| 899 merging foo failed! | 899 merging foo failed! |
| 900 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 900 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 901 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon | 901 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 902 $ echo 'merge 1' > foo | 902 $ echo 'merge 1' > foo |
| 903 $ hg resolve -m foo | 903 $ hg resolve -m foo |
| 904 $ hg ci -m "First merge, related" | 904 $ hg ci -m "First merge, related" |
| 905 | 905 |
| 906 $ hg merge 4 | 906 $ hg merge 4 |
| 907 merging foo | 907 merging foo |
| 908 warning: conflicts during merge. | 908 warning: conflicts during merge. |
| 909 merging foo failed! | 909 merging foo failed! |
| 910 1 files updated, 0 files merged, 0 files removed, 1 files unresolved | 910 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 911 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon | 911 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
| 912 $ echo 'merge 2' > foo | 912 $ echo 'merge 2' > foo |
| 913 $ hg resolve -m foo | 913 $ hg resolve -m foo |
| 914 $ hg ci -m "Last merge, related" | 914 $ hg ci -m "Last merge, related" |
| 915 | 915 |
| 916 $ hg --config "extensions.graphlog=" glog | 916 $ hg --config "extensions.graphlog=" glog |