three-way-merge

I'm trying to do a complicated merge in a complicated hg repository. I'm not happy with the "newest shared ancestor" that Mercurial chooses to use as the "base" to perform the merge. I'd like to specify a specific commit of my own choice to use as base. Is this possible, and if so, how? Mercurial 3.0: You can now select the ancestor to use as a merge base. You do that by setting merge.preferancestor . Mercurial will tell you about it when this makes sense. With the example below, you would see: $ hg merge note: using eb49ad46fd72 as ancestor of 333411d2f751 and 7d1f71140c74 alternatively, use

This is a difficult situation to explain, so bear with me. I have a Mercurial repository with 2 main branches, default and dev . Work is usually done in a named branch off of dev (a feature branch). There may be many feature branches at any one time. Once work is completed in that branch, it is merged back into dev . When the time comes to prepare a release, another named branch is created off of dev (a release branch). Sometimes it is necessary to exclude entire features from a release. If that is the case, the merge changeset from where the feature branch was merged into dev is backed out of

There have been other questions about How to compare arrays in JavaScript? . What I want to know is the most straightforward way to write/use a three-way comparison function like the one required by Array.sort(). Here's an example using the default one which doesn't work well: > [ [4,5,10], [4,5,6], [4,1,2] ].sort() // no compare function, uses the default one [ [ 4, 1, 2 ], [ 4, 5, 10 ], // oops, string sorting makes 10 < 6 [ 4, 5, 6 ] ] This is what I came up with: // return -1 if lhs is "less" than rhs, +1 if "greater", and 0 if equal // if lhs and rhs have different lengths, only the