[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: Christophe R. <christophe_r_at_comcast.net>
Date: Tue, 13 Oct 2009 13:00:27 -0700

> 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

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-13 23:47:58 CEST

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