[PATCH] manifestmerge: local unknown, remote created: don't traverse symlinks

FUJIWARA Katsunori foozy at lares.dti.ne.jp
Fri May 10 09:22:11 CDT 2013


At Thu, 9 May 2013 16:13:58 -0400,
Augie Fackler wrote:
> 
> On Thu, May 9, 2013 at 3:17 PM, Bryan O'Sullivan <bos at serpentine.com> wrote:
> >
> > On Thu, May 9, 2013 at 6:45 AM, Augie Fackler <raf at durin42.com> wrote:
> >>
> >> Queued, thanks.
> >
> >
> > Did you put this on the stable branch, perchance? Seems like that's where it
> > belongs.
> 
> I didn't, but if you feel it does there's always graft.

I'm planning to re-post refined patches around
"merge._checkunknownfile()" below:

  (1) check collision between file(remote) and directory(local unknown)

    http://www.selenic.com/pipermail/mercurial-devel/2013-May/051084.html

  (2) check collision between file(remote) and symlink(local unknown)
      or vice versa

    http://www.selenic.com/pipermail/mercurial-devel/2013-May/051083.html

as a part of series, which also contains below, to fix collision
problems at (linear/branch) merging:

  (3) issue29: check collision between file and directory in merged
      manifest

    http://www.selenic.com/pipermail/mercurial-devel/2013-May/051082.html

  (4) check collision between normal and large files in merged
      manifest on icasefs

    http://www.selenic.com/pipermail/mercurial-devel/2013-May/051087.html

IMHO, (1) and (2) should be applied on Siddharth's work.

Should I post (1)/(2) for default and (3)/(4) for stable separately ?

----------------------------------------------------------------------
[FUJIWARA Katsunori]                             foozy at lares.dti.ne.jp


More information about the Mercurial-devel mailing list