[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svnmerge and new subversion merge-tracking question

From: Raman Gupta <raman_at_rocketraman.com>
Date: 2007-08-26 01:34:14 CEST

Troy Curtis Jr wrote:
> So you are working along making commits to "task_branch". Eventually
> you merge all your changes (or some subset) from the "task_branch"
> back into "trunk", complete with the svnmerge maintained property
> (svnmerge-integrated). It turns out your changes fix an issue that
> exists in the "release 1.0 branch" so you dutifully merge the changes
> from "trunk" to "release 1.0 branch". The trouble is, that revision
> on trunk contains a modification to the 'svnmerge-integrated' property
> because it was performed with svnmerge, but *this* svnmerge operation
> ALSO modified svnmerge-integrated and so it produces a conflict.

Use the latest svnmerge.py on trunk -- this bug has been fixed.

Cheers,
Raman Gupta

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Aug 26 01:31:53 2007

This is an archived mail posted to the Subversion Users mailing list.