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

Blank svn:mergeinfo property being removed during a rollback

From: Brian Neal <bgneal_at_gmail.com>
Date: Tue, 14 Apr 2009 13:10:32 -0500

Hi -

We are using Subversion 1.5.2 on Windows, served via Apache, with the
TortoiseSVN 1.5.3 client.

This morning I decided to rollback a commit I made yesterday, which
was still at the HEAD revision. Using Tortoise, I went to the log
viewer, right clicked on the HEAD revision, and chose "Revert changes
from this revision". It seemed to execute the correct merge command,
and the 5 file changes I made last night were undone as I expected. I
then went to commit this change to leap frog this bad commit, and the
commit dialog brought up 30 some odd files that had changes. It took
me a while to figure this out, but in this commit were the 5 files I
expected, along with 20+ other files who had property only changes. I
sampled many of these property only files, and in all cases what was
happening was that these files had a svn:mergeinfo property set on
them with no value. My commit was trying to delete these blank
svn:mergeinfo properties.

This seemed really strange to me. I created a fresh working copy and
tried to do the same thing and got the same result. Finally I just
committed it. But does anyone have any idea what was going on? Some of
the files in our repository have a long history, and we were using
Subversion 1.4.something a while ago. The repository had been upgraded
to 1.5.2 with svnadmin upgrade.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-04-14 20:23:21 CEST

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