[Svnmerge] Your confirmation is required to join the Svnmerge mailing list

Raman Gupta rocketraman at fastmail.fm
Sat Nov 17 08:21:43 PST 2007


Antonio Maenza wrote:
> I need the ability to do the following  (arrows indicating merge directions)
> trunk <-->Release
> trunk <-->11-12-07_Release
> Release <-->11-12-07_Release

This "graph-style" merging is not supported currently in svnmerge, as 
Jon stated.

> Technically, a structure like:
> trunk <-->Release
> Release <-->11-12-07_Release
> 
> would also work, as I can just merge backwards to the trunk from each 
> branch, however I am still unsure how to make that structure work properly.

This "transitive" structure should be fine. Initialize the branches as 
follows, and use --bidirectional when merging:

on trunk:

	init Release

on Release:

	init trunk
	init 11-12-07_Release

on 11-12-07_Release

	init Release

Cheers,
Raman Gupta



More information about the Svnmerge mailing list