[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Giovanni Bajo <rasky_at_develer.com>
Date: 2006-04-05 13:00:15 CEST

Madan U S <madan@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
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Apr 5 13:00:53 2006

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.