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

Re: Merge doesn't Add files

From: Mike Dixon <michael.dixon_at_denovosoftware.com>
Date: Tue, 13 Oct 2009 15:15:03 -0700

Christophe R. wrote:
>> I am seeing the same situation. I have tsvn 1.6.5-17408 (latest) and svn
>> server version 1.6.5
>> At the end of the merge, the files that are marked in red as "Skipped" in
>> the merge dialog show as unversionned in the WC where the merge took
>> place.
>>
>> Christophe
>
> I completely deleted my WC, did a fresh checkout, then merged again: this
> time, it worked. This was my third attempt.
>
> The first attempt (also on a fresh checkout) worked fine, but as I looked at
> the merge results, I realized I had some changes to make in the trunk first.
> So I reverted the merge, ran tsvn clean up and update, made my changes to
> the trunk (commit), did update again on WC, and try to merge (second
> attempt): that failed with some skipped files.
>
> Christophe

This is caused by two pieces of svn logic that independently make sense,
but together cause something unexpected.

1. Reverting an "svn add" just unversions the file without deleting it.
(Because maybe it is the only copy of the file and you are adding it for
the first time.)
2. Merged changes are skipped if the file already exists in your WC and
is unversioned. (Because maybe it is the only copy of the file, and
merging would alter/destroy the contents.)

Together these cause the observed behavior:
1. Merge
   ---> adds new file
2. Revert
   ---> unversions file
3. Merge again
   ---> skips merging file because you have an unversioned copy

So the answer here is "It's not a bug, it's a feature"; the feature in
this case being "don't destroy or alter unversioned data".

You'll have to change your process: after reverting a merge, check if
there are any left-over unversioned files, and delete the ones that you
don't want to keep.

-Mike

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2407344

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-14 00:15:16 CEST

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