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

Weird merge behavior - extra files 'touched'

From: Ruslan Sivak <russ_at_vshift.com>
Date: Thu, 23 Oct 2008 16:17:38 -0400

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?


To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-10-23 22:18:22 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.