[Svnmerge] How to handle manual merges with svnmerge?

Thomas Heller theller at ctypes.org
Fri Oct 20 12:50:17 PDT 2006


Daniel Rall schrieb:
> 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
Cool.

Thanks, Thomas




More information about the Svnmerge mailing list