How do I revert unresolved merges?
Brent Scriver
bscriver at phxlabs.ca
Thu Dec 4 16:04:48 UTC 2014
Hi all,
I am working with Mercurial 3.2.1 and I'm running experiments with it to
get familiar with the work flow, primarily for merging changes from
different repositories as we use a number of third party tools (with
occasional custom edits).
I encountered a scenario I couldn't easily identify a way to back out of.
Given repository A & B and having done a pull -f of B into A, I want to
merge subsequent changes.
It looks like until I complete the merge, hg revert will only revert
changes that have been resolved. How do I revert those that are not
resolved (and the entire merge altogether as if the pull request hasn't
happened)?
The only guaranteed solution I could find was to delete my local of A and
re-clone it (making it very important that all pending changes in the
working copy have been pushed back).
Recommendations?
Thank you,
Brent Scriver
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial/attachments/20141204/f3941508/attachment.html>
More information about the Mercurial
mailing list