[Svnmerge] [PATCH] Allow multiple 'svnmerge init's in a singlerevision

Giovanni Bajo rasky at develer.com
Wed Apr 5 04:00:15 PDT 2006


Madan U S <madan at collab.net> wrote:

> [[[
> Allow multiple 'svnmerge init' commands (with differing copyfrom
> parameters, of course) in a single revision.
>
> * contrib/client-side/svnmerge.py
>   (check_dir_clean): Modified to error out, only if the change is NOT
>   just another modification of the svnmerge-integrated property.
>   IOW, dont error out, if the only other change in the working copy
>   is an svnmerge-integrated property change.
> ]]]

What's the rationale of this patch? You can use --force to achieve the same.
-- 
Giovanni Bajo




More information about the Svnmerge mailing list