[PATCH RFC] revert: add --force option

Matt Mackall mpm at selenic.com
Thu Jul 21 12:47:24 CDT 2011


On Thu, 2011-07-21 at 19:40 +0200, Dirkjan Ochtman wrote:
> On Thu, Jul 21, 2011 at 19:39, Dirkjan Ochtman <dirkjan at ochtman.nl> wrote:
> > For context, what exactly was the change in 1.9?
> 
> Never mind, I read the bug report.
> 
> So you now don't have to explicitly pick one of the parents when the
> working dir is in a merge state? That just seems like a regression.

Well it was an intentional change, and one that was called out in the
release notes. The code seemed to be there for arbitrary historical
reasons so I expected no one to care; I was clearly wrong and we should
undo it.

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list