[Bug 4079] New: update/merge on bookmarks is confusing

[mercurial-bugs at selenic.com]

http://bz.selenic.com/show_bug.cgi?id=4079

          Priority: normal
            Bug ID: 4079
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: update/merge on bookmarks is confusing
          Severity: bug
    Classification: Unclassified
                OS: Windows
          Reporter: givas84 at gmail.com
          Hardware: PC
            Status: UNCONFIRMED
           Version: 2.7.2
         Component: Mercurial
           Product: Mercurial

Currently, you can move bookmarks to tip by running "hg update". This results
in confusing behavior after a pull. If there are new changes for the active
bookmark, the first "hg up" will move to the updated bookmark. If there are no
changes, "hg up" will move the active bookmark to tip.

In other words, "hg up" with exactly the same arguments results in two
different behaviors. Also, "hg pull -u" and "hg pull && hg up" don't have the
same result because "hg pull -u" doesn't update when there are no incoming
changesets.

I'd like to suggest that "hg up" (without a revision) becomes the same as "hg
up ACTIVE_BOOKMARK" (or "hg up tip" if there is no active bookmark).

In order to allow moving bookmarks in a sensible way, "hg merge SOMEBOOKMARK"
should move bookmarks even if the active bookmark and SOMEBOOKMARK are parents
of the same head. Currently, hg just says "abort: nothing to merge" in that
case. However, what the user actually wants is that the active bookmark
contains the changesets of SOMEBOOKMARK. This is also the way git branches
behave, by the way.

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