[Svnmerge] How to handle manual merges with svnmerge?

Daniel Rall dlr at collab.net
Fri Oct 20 12:23:53 PDT 2006


On Fri, 20 Oct 2006, Thomas Heller wrote:

> I did 'svnmerge init' in a branch *after* already some changes have been
> merged from the trunk.  Is there a way to mark these revisions as integrated
> with svnmerge (or would I have to edit the svnmerge-integrated property manually) ?

svnmerge.py merge --record-only -rREVS
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20061020/d7c322b9/attachment-0002.pgp>


More information about the Svnmerge mailing list