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

Strange mergeinfo-behaviour on double move

From: Tor Ringstad <torhr_at_pvv.org>
Date: 2007-11-13 19:43:58 CET

I was toying around with subversions new "multiple working copy
copy/move operations" when I noticed the following strange behaviour:

If I simultaneously rename both a directory and a file in that
directory, then commit, then update, I will suddenly have local
modifications in my WC (added svn:mergeinfo).

Here's a reproduction:

# Preparations; create a directory with one file

svn mkdir dir
touch dir/file
svn add dir/file
svn commit -m "preparations"
svn up
svn st

# Rename both the directory and the file

svn mv dir dir2
svn mv dir2/file dir2/file2
svn commit -m "double move"
svn st

# Everything seems fine so far, in particular no local changes. But at
# the next update, something surprising happens:

svn up
# At revision 55.

svn st
# M dir2/file2

# What? We suddenly have local changes?

svn diff
# Property changes on: dir2/file2
# ___________________________________________________________________
# Name: svn:mergeinfo

- Tor Ringstad -

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 13 19:44:42 2007

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