[Svnmerge] How to handle manual merges with svnmerge?

[Blair Zajac]

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) ?

Hello Thomas,

Use the

   -M [--record-only]          : do not perform an actual merge of the changes,
                                 yet record that a merge happened

option to svnmerge merge.

Regards,
Blair