Re: Problem with merge tracking in 1.5.0

On Mon, Jul 7, 2008 at 6:44 AM, Colm Aengus Murphy
<colm.murphy_at_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
merge.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org