[Svnmerge] Fwd: [PATCH] preserving mods to renamed files/directories

Dustin J. Mitchell dustin at zmanda.com
Thu Jul 12 11:19:07 PDT 2007


On Thu, Jul 12, 2007 at 01:00:08PM -0500, Archie Cobbs wrote:
>    I'm not sure if this is directly relevant to this issue, but here's a
>    possibly useful idea to help with situations like this....
>    In the same way that "svn diff" allows you to plug in your own diff(1)
>    command using the "--diff-cmd" flag, why not have add a flag like
>    "--merge-cmd" to svnmerge that allows you to plug in your own merge
>    command ( i.e., it would be used in place of "svn merge")?
>    Then, instead of folding special merge functionality into svnmerge,
>    once could just provide their own "merge" tool that can be plugged
>    into svnmerge. Such a merge tool might better handle the
>    "rename/merge" problem, etc.

I like that idea a lot!

Dustin

-- 
        Dustin J. Mitchell
        Storage Software Engineer, Zmanda, Inc.
        http://www.zmanda.com/



More information about the Svnmerge mailing list