Weird merge behavior - extra files 'touched'

[Ruslan Sivak <ru...@vshift.com>]

It seems that since we've upgraded to 1.5, we are having strange issues 
when merging.  So far, I have noticed the issue in both Subclipse and 
Subversive, so I think it's either an issue with the working copy code 
or JavaHL (I'm using r31699 right now with Subversive). 

Basically I do a total commit/revert/update of a workspace so that it's 
totally clean and up to date.  I'm switched to trunk.
I merge in a branch.  When previewing and merging, it looks like the 
right files get merged.
Once I try to commit, however, it seems that a some other files have 
been 'touched' and want to be committed.  When checking the differences 
on those files, there are none (and in fact SubClipse would display a 
different icon for them in the commit dialog). 

Is this some sort of bug in svn or am I doing something wrong?

Russ

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Weird merge behavior - extra files 'touched'

[Mark Phippard <ma...@gmail.com>]

On Thu, Oct 23, 2008 at 4:17 PM, Ruslan Sivak <ru...@vshift.com> wrote:
> It seems that since we've upgraded to 1.5, we are having strange issues when
> merging.  So far, I have noticed the issue in both Subclipse and Subversive,
> so I think it's either an issue with the working copy code or JavaHL (I'm
> using r31699 right now with Subversive).
> Basically I do a total commit/revert/update of a workspace so that it's
> totally clean and up to date.  I'm switched to trunk.
> I merge in a branch.  When previewing and merging, it looks like the right
> files get merged.
> Once I try to commit, however, it seems that a some other files have been
> 'touched' and want to be committed.  When checking the differences on those
> files, there are none (and in fact SubClipse would display a different icon
> for them in the commit dialog).
> Is this some sort of bug in svn or am I doing something wrong?

It sounds like it may just be the svn:mergeinfo property being
updated.  Run svn diff on your WC and see what it reports for those
items.

Once an item acquires an svn:mergeinfo property every merge will
update that property to reflect the revisions that were merged, even
if the merge did not update those items specifically.

-- 
Thanks

Mark Phippard
http://markphip.blogspot.com/

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org