Strategies for push/merge problem?

[Sean Russell]

On Tuesday 15 July 2008 07:43:04 pm Douglas Philips wrote:
> somewhere, etc.    I have to say, this is one place that darcs -
> absolutely- rocks. As I've been using Hg for a while, I've come to
> like Hg's view of history and darcs has some other deep problems, but
> all that said, darcs record (because of the way darcs commutes
> patches) hasn't yet been touched (I haven't used git, so maybe they do

Are you using HG 1.0.1 yet?

	http://www.selenic.com/mercurial/wiki/index.cgi/RecordExtension

is now a "distributed with Mercurial" extension.

--- SER