facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'

Browse Source 
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.
This commit is contained in:
Brodie Rao 2010-09-12 18:05:53 -05:00
parent 1aec67382d
commit 4be7b3bfc3
15 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mercurial/hg.py
View File

@ -403,7 +403,7 @@ def merge(repo, node, force=None, remind=True):
_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

2
tests/test-add.t
View File

@ -53,7 +53,7 @@ should fail
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

2
tests/test-commit-unresolved.t
View File

@ -31,7 +31,7 @@ Merging a conflict araises
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

2
tests/test-conflict.t
View File

@ -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

2
tests/test-convert-svn-sink.out
View File

@ -265,7 +265,7 @@ merging b
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'

2
tests/test-keyword.t
View File

@ -817,7 +817,7 @@ conflict: keyword should stay outside conflict zone
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

4
tests/test-log.t
View File

@ -898,7 +898,7 @@ log -p -R repo
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 @@ log -p -R repo
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"

2
tests/test-merge-internal-tools-pattern.t
View File

@ -42,7 +42,7 @@ Merge using internal:fail tool:
$ 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

28
tests/test-merge-tools.out
View File

@ -17,7 +17,7 @@ merging f
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 @@ false.whatever=
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 @@ true.priority=1
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 @@ true.priority=1
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 @@ true.priority=1
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 @@ true.priority=1
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 @@ true.executable=cat
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 @@ couldn't find merge tool true specified for f
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 @@ couldn't find merge tool true specified for f
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 @@ true.executable=cat
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 @@ true.executable=cat
# 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 @@ true.executable=cat
# 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 @@ true.executable=cat
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 @@ merging f
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

4
tests/test-merge7.t
View File

@ -47,7 +47,7 @@ now pull and merge from test-a
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 @@ pull and merge from test-a again
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

4
tests/test-merge9.t
View File

@ -30,7 +30,7 @@ test with the rename on the remote side
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 @@ test with the rename on the local side
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

4
tests/test-mq-qnew.out
View File

@ -53,7 +53,7 @@ merging a
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 @@ merging a
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

2
tests/test-resolve.t
View File

@ -23,7 +23,7 @@ failing merge
$ 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

2
tests/test-status-color.t
View File

@ -267,7 +267,7 @@ test unknown color
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:

2
tests/test-subrepo.t
View File

@ -217,7 +217,7 @@ merge tests
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)