[PATCH 2 of 3 V2] merge: remove directory recursively, if there is no one other than directories
Matt Mackall
mpm at selenic.com
Thu May 16 15:49:56 CDT 2013
On Thu, 2013-05-16 at 13:26 -0700, Siddharth Agarwal wrote:
> On 05/15/2013 08:44 AM, FUJIWARA Katsunori wrote:
> > # HG changeset patch
> > # User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
> > # Date 1368632246 -32400
> > # Thu May 16 00:37:26 2013 +0900
> > # Node ID 185f02ec640199455dabfb80ebaca407f1249f82
> > # Parent 06f5233fe026033740b5f7ee77234bd0a9b02016
> > merge: remove directory recursively, if there is no one other than directories
>
> I'm uncomfortable with file system modifications happening in
> _checkunknown, or really at all during the calculate phase. mpm needs to
> comment here.
Yeah, it's a bit of a step in the wrong direction, especially given:
http://mercurial.selenic.com/wiki/ConsensusMerge
--
Mathematics is the supreme nostalgia of our time.
More information about the Mercurial-devel
mailing list