[Svnmerge] svnmerge and externals

Ericsson, Lars lars.ericsson at kollmorgen.com
Mon Nov 7 01:32:36 PST 2011


Hi,

I came across a problem with svnmerge using externals.

Svnmerge uses 'svn st -q .' to determine if the working copy is clean or
not.
This works fine for non-external files/folder and external folders.

External files are still listed which result in svnmerge returning,
'svnmerge: "." has local modifications; it must be clean'

Adding --force will override problem.

Using svn version 1.7, will make this worse, since 'svn st -q .' now
reports 
both external files and folders.


Any ideas of fixing this behavior ?


Regards
Lars Ericsson


Please be advised that this email may contain confidential 
information.  If you are not the intended recipient, please notify us 
by email by replying to the sender and delete this message.  The 
sender disclaims that the content of this email constitutes an offer 
to enter into, or the acceptance of, any agreement; provided that the 
foregoing does not invalidate the binding effect of any digital or 
other electronic reproduction of a manual signature that is included 
in any attachment.





More information about the Svnmerge mailing list