Hi folks,
I'm seeing a problem with the merge tracking feature in 1.5.0 and was
wondering if anyone else has seen this.
The problem occurs when doing a repeated merge of a user branch back to
a development branch.
I ran two tests.
In the first test a file was edited in both devel and user branches but
the edits were in different parts of the file.
When the user branch was merged using "svn merge --reintegrate" svn did
an automatic merge. I commit the changes.
If the merge command is repeated at a later stage svn notices that the
merge already took place and doesn't merge the file.
(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)
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)
Regards
Colm A
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_at_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_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-07-07 12:44:48 CEST