[Svnmerge] 2 questions about svnmerge

[Daniel Rall]

On Wed, 14 Feb 2007, golan davidovits wrote:

> Hello All,
> 
> First i would like to say thanks for the svmerge patch for the svnmerge-integrated conflict situation.
> It works well now.
> 
> I have 2 more questions:
> 
> 1. Can i control the svnmerge-commit-message.txt file format?
> I would like it to show only the information relevant to the current check-in without the historical dependancies:
> 
> Author:
> Data:
> New Revision:
> 
> Modified:
> Log:
> Merged Revisions ..... via svnmerge from
> link...

The only way to control this format is to edit svnmerge.py itself.

> 2. Is there a limitation for the amount of branches that svnmerge-integrated can support?
> For example: string length limitation?

Not of that sort.

But transitive merge info can cause property conflicts for
"svnmerge-integrated" (e.g. when merging from A -> B, then B -> C).
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20070217/359ec2b1/attachment-0001.pgp>