https://bz.mercurial-scm.org/show_bug.cgi?id=5550
Bug ID: 5550
Summary: During merge, the message when a file was deleted on
one side but changed on the other is hard to decypher
Product: Mercurial
Version: 4.1
Hardware: Macintosh
OS: Mac OS
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: Mercurial
Assignee: bugzi...@mercurial-scm.org
Reporter: roma...@unity3d.com
CC: mercurial-devel@mercurial-scm.org
Here is the message I have:
$ hg merge trunk
other [merge rev] changed some_file.cs which local [working copy] deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
Here is the version without the brackets that I'm trying to decypher:
other changed some_file.cs which local deleted
use changed version, leave deleted, or leave unresolved?
I can vaguely understand that a file has been changed on one side but edited on
the other, but which side is which and which option I should select is quite
Chinese for me.
Here is a message that I could better understand:
The file `some_file.cs' has been deleted in [merge rev] but changed in
[working copy], what do you want to do?
Use (c)hanged version [working copy], keep (d)eleted [merge rev], or
leave (u)nresolved?
Thanks!
--
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
