Mercurial > hg > mercurial-crew
changeset 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 | 2912881c2a98 |
| children | ca58f6475f1d |
| files | mercurial/hg.py tests/test-add.t tests/test-commit-unresolved.t tests/test-conflict.t tests/test-convert-svn-sink.out tests/test-keyword.t tests/test-log.t tests/test-merge-internal-tools-pattern.t tests/test-merge-tools.out tests/test-merge7.t tests/test-merge9.t tests/test-mq-qnew.out tests/test-resolve.t tests/test-status-color.t tests/test-subrepo.t |
| diffstat | 15 files changed, 32 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -403,7 +403,7 @@ _showstats(repo, stats) if stats[3]: repo.ui.status(_("use 'hg resolve' to retry unresolved file merges " - "or 'hg update -C' to abandon\n")) + "or 'hg update -C .' to abandon\n")) elif remind: repo.ui.status(_("(branch merge, don't forget to commit)\n")) return stats[3] > 0
--- a/tests/test-add.t +++ b/tests/test-add.t @@ -53,7 +53,7 @@ warning: conflicts during merge. merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved - use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon + use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon $ hg st M a ? a.orig
--- a/tests/test-commit-unresolved.t +++ b/tests/test-commit-unresolved.t @@ -31,7 +31,7 @@ warning: conflicts during merge. merging A failed! 1 files updated, 0 files merged, 0 files removed, 1 files unresolved - use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon + use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon Correct the conflict without marking the file as resolved
--- a/tests/test-conflict.t +++ b/tests/test-conflict.t @@ -15,7 +15,7 @@ warning: conflicts during merge. merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved - use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon + use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon $ hg id 32e80765d7fe+75234512624c+ tip
--- a/tests/test-convert-svn-sink.out +++ b/tests/test-convert-svn-sink.out @@ -265,7 +265,7 @@ warning: conflicts during merge. merging b failed! 2 files updated, 0 files merged, 0 files removed, 1 files unresolved -use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon +use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon assuming destination b-hg initializing svn repository 'b-hg' initializing svn working copy 'b-hg-wc'
--- a/tests/test-keyword.t +++ b/tests/test-keyword.t @@ -817,7 +817,7 @@ warning: conflicts during merge. merging m failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved - use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon + use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon $ cat m $Id$ <<<<<<< local
--- a/tests/test-log.t +++ b/tests/test-log.t @@ -898,7 +898,7 @@ warning: conflicts during merge. merging foo failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved - use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon + use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon $ echo 'merge 1' > foo $ hg resolve -m foo $ hg ci -m "First merge, related" @@ -908,7 +908,7 @@ warning: conflicts during merge. merging foo failed! 1 files updated, 0 files merged, 0 files removed, 1 files unresolved - use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon + use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon $ echo 'merge 2' > foo $ hg resolve -m foo $ hg ci -m "Last merge, related"
--- a/tests/test-merge-internal-tools-pattern.t +++ b/tests/test-merge-internal-tools-pattern.t @@ -42,7 +42,7 @@ $ hg merge 0 files updated, 0 files merged, 0 files removed, 1 files unresolved - use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon + use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon $ cat f line 1
--- a/tests/test-merge-tools.out +++ b/tests/test-merge-tools.out @@ -17,7 +17,7 @@ warning: conflicts during merge. merging f failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved -use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon +use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon # cat f <<<<<<< local revision 1 @@ -37,7 +37,7 @@ merging f merging f failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved -use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon +use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon # cat f revision 1 space @@ -69,7 +69,7 @@ merging f merging f failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved -use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon +use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon # cat f revision 1 space @@ -86,7 +86,7 @@ merging f merging f failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved -use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon +use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon # cat f revision 1 space @@ -103,7 +103,7 @@ merging f merging f failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved -use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon +use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon # cat f revision 1 space @@ -120,7 +120,7 @@ merging f merging f failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved -use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon +use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon # cat f revision 1 space @@ -185,7 +185,7 @@ merging f merging f failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved -use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon +use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon # cat f revision 1 space @@ -204,7 +204,7 @@ merging f merging f failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved -use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon +use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon # cat f revision 1 space @@ -223,7 +223,7 @@ merging f merging f failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved -use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon +use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon # cat f revision 1 space @@ -244,7 +244,7 @@ merging f merging f failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved -use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon +use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon # cat f revision 1 space @@ -260,7 +260,7 @@ # hg update -C 1 # hg merge -r 2 --config ui.merge=internal:fail 0 files updated, 0 files merged, 0 files removed, 1 files unresolved -use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon +use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon # cat f revision 1 space @@ -323,7 +323,7 @@ # hg merge -r 2 --config ui.merge=internal:dump merging f 0 files updated, 0 files merged, 0 files removed, 1 files unresolved -use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon +use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon # cat f revision 1 space @@ -354,7 +354,7 @@ merging f merging f failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved -use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon +use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon # cat f revision 1 space @@ -537,7 +537,7 @@ was merge successful (yn)? n merging f failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved -use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon +use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon # cat f revision 1 space
--- a/tests/test-merge7.t +++ b/tests/test-merge7.t @@ -47,7 +47,7 @@ warning: conflicts during merge. merging test.txt failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved - use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon + use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon resolve conflict $ cat >test.txt <<"EOF" > one @@ -91,7 +91,7 @@ warning: conflicts during merge. merging test.txt failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved - use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon + use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon $ cat test.txt one
--- a/tests/test-merge9.t +++ b/tests/test-merge9.t @@ -30,7 +30,7 @@ merging bar failed! merging foo and baz to baz 1 files updated, 1 files merged, 0 files removed, 1 files unresolved - use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon + use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon $ hg resolve -l U bar R baz @@ -43,7 +43,7 @@ merging bar failed! merging baz and foo to baz 1 files updated, 1 files merged, 0 files removed, 1 files unresolved - use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon + use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon show unresolved $ hg resolve -l
--- a/tests/test-mq-qnew.out +++ b/tests/test-mq-qnew.out @@ -53,7 +53,7 @@ warning: conflicts during merge. merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved -use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon +use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon abort: cannot manage merge changesets %%% hg headers adding a @@ -116,5 +116,5 @@ warning: conflicts during merge. merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved -use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon +use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon abort: cannot manage merge changesets
--- a/tests/test-resolve.t +++ b/tests/test-resolve.t @@ -23,7 +23,7 @@ $ HGMERGE=internal:fail hg merge 0 files updated, 0 files merged, 0 files removed, 1 files unresolved - use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon + use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon $ echo resolved > file $ hg resolve -m file
--- a/tests/test-status-color.t +++ b/tests/test-status-color.t @@ -267,7 +267,7 @@ warning: conflicts during merge. merging b failed! 0 files updated, 0 files merged, 0 files removed, 2 files unresolved - use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon + use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon $ hg resolve -m b hg resolve with one unresolved, one resolved:
--- a/tests/test-subrepo.t +++ b/tests/test-subrepo.t @@ -217,7 +217,7 @@ warning: conflicts during merge. merging t failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved - use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon + use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)