On Tue, 14 Aug 2007, Juan Manuel Palacios wrote:
> On Aug 13, 2007, at 9:05 AM, Dustin J. Mitchell wrote:
...
> > This is acutally a known limitation in svn itself. While you can
> > merge
> > updates ("U") between schemes without a problem, svn doesn't yet
> > support this for adds ("A").
> >
> > I've been thinking of taking a crack at fixing that in svn at some
> > point, but that's obvioulsy a fairly large learning curve.
> >
> > At this point, to do a merge containing adds, you need to use the '-M'
> > flag to svnmerge to update the properties, then create a patch (with
> > 'svn diff'), apply it (with 'patch'), and manually svn add/svn delete
> > any added/deleted files. It's annoying, I know -- I have to do it
> > once every few days.
...
> Thanks for the explanation and sorry for the false alarm, I was not
> aware of that limitation and only came across it when not bothering
> to mess with my Apache configuration when setting up svn locally I
> really do hope it gets resolved soon (1.5?) as it imposes
> considerable constraints on legit work flows (and I'm sure you and I
> aren't the only ones ;-).
...Juan, patches fixing this limitation in Subversion would be welcome, and could still make it into the upcoming 1.5 release. - Dan
pgpvNB7lgv7fz.pgp
Description: PGP signature
_______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
