You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Brian Neal <bg...@gmail.com> on 2009/04/14 18:10:32 UTC
Blank svn:mergeinfo property being removed during a rollback
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.
Thanks,
BN
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1714210
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: Blank svn:mergeinfo property being removed during a rollback
Posted by Bob Archer <bo...@amsi.com>.
It is my understanding that most of this issue was resolved in 1.5.5 of
svn. I think the 1.5.3 TSVN is link to svn 1.5.3 libraries. So, you
should upgrade your TSVN client to one that is linked to svn 1.5.5 libs.
BOb
> -----Original Message-----
> From: Brian Neal [mailto:bgneal@gmail.com]
> Sent: Tuesday, April 14, 2009 2:11 PM
> To: users@subversion.tigris.org
> Subject: Blank svn:mergeinfo property being removed during a rollback
>
> 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.
>
> Thanks,
> BN
>
> ------------------------------------------------------
>
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageI
d=
> 1714210
>
> To unsubscribe from this discussion, e-mail: [users-
> unsubscribe@subversion.tigris.org].
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1714313
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].