[Bug 5125] New: Allow cross-branch updates with uncommitted changes in the working copy

mercurial-bugs at selenic.com mercurial-bugs at selenic.com
Fri Mar 4 05:43:42 EST 2016


https://bz.mercurial-scm.org/show_bug.cgi?id=5125

            Bug ID: 5125
           Summary: Allow cross-branch updates with uncommitted changes in
                    the working copy
           Product: Mercurial
           Version: stable branch
          Hardware: PC
                OS: Windows
            Status: UNCONFIRMED
          Severity: feature
          Priority: wish
         Component: Mercurial
          Assignee: bugzilla at selenic.com
          Reporter: gabor.stefanik at nng.com
                CC: mercurial-devel at selenic.com

Currently, "hg update" requires either "--check" or "--clean" to perform a
cross-branch update, making it impossible to preserve uncommitted changes
across the update.

There doesn't appear to be a good reason for this, as a 3-way merge with base =
current working copy parent, local = working copy contents, remote = new
working copy parent (which is what we currently do for in-branch updates) does
the right thing for cross-branch updates also.

I suggest adding a "-f", "--force" option to just override the
ancestor/descendant check, but still use the merge mechanism normally used for
updating.


This is an svn-parity issue, as Subversion is able to perform a "switch"
operation (equivalent to cross-branch update in Hg) with working copy changes
in the way. I believe it's also git-parity.

-- 
You are receiving this mail because:
You are on the CC list for the bug.


More information about the Mercurial-devel mailing list