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

Re: Problem with merge tracking in 1.5.0

From: Colm Aengus Murphy <colm.murphy_at_s3group.com>
Date: Mon, 07 Jul 2008 15:20:46 +0100
Hi Mark,

See comments below.


Colm A

Mark Phippard wrote:
On Mon, Jul 7, 2008 at 6:44 AM, Colm Aengus Murphy
<colm.murphy@s3group.com> wrote:

(it does however update the top level directory with the details of the
merge even though no merge was necessary which is a separate issue)

That is the expected behavior as it still marks the revisions that
have occurred in the repository since the last merge.

In the second test the file was edited in both devel and user branches but
this time in the same part of the file.
When the user branch was merged using "svn merge --reintegrate" svn flags a
conflict. I manually resolve the conflict and commit the changes.
This time if the merge command is repeated at a later stage svn doesn't seem
to notice that the merge already took place and flags a conflict.

Is this a bug ?

I'm using svn 1.5.0 on RHEL4 (the same problem is also seen using svn 1.5.0
on win32)

Did you commit the change to the svn:mergeinfo property when you
committed the first merge?  This would have been set at the root of
your project you merged into.  If you only committed the changed file,
then the merge tracking information would not have been recorded.  You
should be able to see this via svn log or diff of the commit of the

I committed all changes (including the change to the dir at the root of the project). I can see the details of the merge using svn log -g (or using Tortoise SVN repo browser).
The only difference between the two tests was that in the second test the merged file had a conflict.

 Colm Aengus Murphy,                Tel       : +353 1 2911000
 Release Manager,                   Direct Tel: +353 1 2911373
 Consumer Mobile,
 Silicon & Software Systems,        Fax       : +353 1 2911001
 South County Business Park,
 Leopardstown,                      E-mail: colm.murphy@s3group.com
 Dublin 18.                         WWW   : www.s3group.com

The information contained in this e-mail and in any attachments is confidential and is designated solely for the attention of the intended recipient(s). If you are not an intended recipient, you must not use, disclose, copy, distribute or retain this e-mail or any part thereof. If you have received this e-mail in error, please notify the sender by return e-mail and delete all copies of this e-mail from your computer system(s). Please direct any additional queries to: communications@s3group.com. Thank You. Silicon and Software Systems Limited. Registered in Ireland no. 378073. Registered Office: South County Business Park, Leopardstown, Dublin 18

--------------------------------------------------------------------- To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org For additional commands, e-mail: users-help@subversion.tigris.org Received on 2008-07-07 16:21:18 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.