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

"Zombie" files repeatedly updated when merging between branch and trunk

From: Chris Herron <cherro_at_gmail.com>
Date: Thu, 16 Apr 2009 19:44:35 -0400

Hi,

I have an irritating recurring issue when I merge from a branch to
trunk. The same 9 files, plus their parent directory, keep getting
updated, even when those files have not been modified (neither on
branch nor trunk). We're using Subversion 1.5.

Steps in more detail:

1. Create a branch from head of trunk.
2. Modify one file (say foo/example.txt) on branch working copy,
commit that file only.
3. Within root of trunk working copy:
run: svn merge --reintegrate branch-url
output:
--- Merging differences between repository URLs into '.':
  U bar/zombie1.txt
  U bar/zombie2.txt
  U bar/zombie3.txt
  U bar/zombie4.txt
  U bar/zombie5.txt
  U bar/zombie6.txt
  U bar/zombie7.txt
  U bar/subdir/zombie8.txt
  U bar/subdir/zombie9.txt
  U bar
  U foo/example.txt
  U .

4. Commit these updates to trunk.

Prior to step 4, observing the diffs, there are no material changes to
the files themselves - they are identical to their latest revisions on
the trunk (except for foo/example.txt, which was expected).
Comparing the svn:merginfo between the working copies and trunk, all
of the zombie files, and the "bar" directory gain the branch and its
corresponding revisions, while foo/example.txt does not.

This re-occurs with every merge, even on new branches. Note that these
aren't the only files under directory "bar" - but *only* these files
keep reappearing as updates.

Any suggestions as to what might be causing this, and how I might
correct it?

Cheers,

Chris.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1757078

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-04-17 02:22:48 CEST

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