[Bug 5267] New: hg unshelve with conflict creates changeset that can get pulled into other repos
mercurial-bugs at selenic.com
mercurial-bugs at selenic.com
Fri Jun 17 02:21:31 UTC 2016
https://bz.mercurial-scm.org/show_bug.cgi?id=5267
Bug ID: 5267
Summary: hg unshelve with conflict creates changeset that can
get pulled into other repos
Product: Mercurial
Version: 3.7.3
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: feature
Priority: wish
Component: shelve
Assignee: bugzilla at selenic.com
Reporter: crazycasta at gmail.com
CC: mercurial-devel at selenic.com
Created attachment 1920
--> https://bz.mercurial-scm.org/attachment.cgi?id=1920&action=edit
Result of script showing the problem.
Unshelving a set of changes that cause an unresolved conflict results in a
changeset being created. I'm not really sure what the purpose of the changeset
is. In any case this isn't a problem so long as the changeset can't get pulled
into other repos. Currently it the changeset can get pulled in, which is quite
an annoyance. I can fix the problem with the strip extension at the moment, but
generally by the time I notice the problem it's been pulled into a number of
other places already.
--
You are receiving this mail because:
You are on the CC list for the bug.
More information about the Mercurial-devel
mailing list