[Svnmerge] Handling of file/directory renames

Laurent PETIT laurent.petit at gmail.com
Wed Mar 5 00:52:41 PST 2008


OK, thanks for the information,

-- 
Laurent

2008/3/4, Archie Cobbs <archie at dellroad.org>:
>
> Yes, svnmerge uses "svn merge" as the underlying engine for actually doing
> the merges, so unfortunately it does inherit the file rename/merge problem
> from svn itself.
>
> -Archie
>
> On Tue, Mar 4, 2008 at 3:23 PM, Laurent PETIT <laurent.petit at gmail.com>
> wrote:
>
> > Hello,
> >
> > I'm currently evaluating a choice between the use of svnmerge or svk for
> > efficient merge handling on an svn repository.
> >
> > I saw on the mailing list some posts concerning the handling of file
> > renames, but I'm not sure of the current state of svnmerge related to
> > this question :
> >
> > Could you please tell me if svnmerge in the trunk corrects the bug(s) of
> > svn merge which does not gracefully handle file renames ?
> >
> > Cons for svk : does not correctly handle cherry picking
> > Cons (?) for svnmerge : does not correctly handle file/directory renames
> > ? (or am I wrong ?)
> >
> > Thanks in advance,
> >
> > --
> > Cordialement,
> >
> > Laurent PETIT
> > SQLI Lyon
> >
> > _______________________________________________
> > Svnmerge mailing list
> > Svnmerge at orcaware.com
> > http://www.orcaware.com/mailman/listinfo/svnmerge
> >
> >
>
>
> --
> Archie L. Cobbs
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/svnmerge/attachments/20080305/136c8d30/attachment.html>


More information about the Svnmerge mailing list