[PATCH 2 of 2] bookmarks: on a bare merge use config to choose target or choose @

Matt Mackall mpm at selenic.com
Tue Mar 11 17:16:32 CDT 2014


On Tue, 2014-03-11 at 22:20 +1100, Stephen Lee wrote:
> # HG changeset patch
> # User Stephen Lee <sphen.lee at gmail.com>
> # Date 1394536638 -39600
> #      Tue Mar 11 22:17:18 2014 +1100
> # Node ID 44db1ede5c65a0265203f5df063049813d2da8c8
> # Parent  ff0ffb9855d8e88fbcce967867f2a373eaac581f
> bookmarks: on a bare merge use config to choose target or choose @
> 
> When running "hg merge" if there is an active and current bookmark
> look in config for a key "bookmarks.<name>.track" and it will name
> the bookmark we should merge with.  If the key is missing, and an
> @ bookmark exists, merge with it instead.

I have no idea what the rationale here is, but it sounds like a behavior
change that's going to cause me to accidentally do horrible horrible
things like merge @ into stable without realizing it. This is worrisome.

Also, this sort of patch should probably be split into two patches:

- create surprise merge accidents
- do some mysterious tracking thing

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list