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

Madan U S madan at collab.net
Wed Apr 5 02:50:06 PDT 2006



[[[
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.
]]]

-------------- next part --------------
An HTML attachment was scrubbed...
URL: /pipermail/svnmerge/attachments/20060405/1bae380b/attachment.htm 
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: sm-multiple-init-patch.txt
Url: /pipermail/svnmerge/attachments/20060405/1bae380b/attachment.txt 
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: sm-multiple-init-log.txt
Url: /pipermail/svnmerge/attachments/20060405/1bae380b/attachment-0001.txt 


More information about the Svnmerge mailing list