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

Re: Tortoise not adding new files during merge.

From: Felix Saphir <felix.saphir_at_kantarmedia.com>
Date: Wed, 27 Jul 2011 16:23:36 +0200

Am 27.07.2011 16:13, schrieb darrinps:
> Had the wrong option set is all. Needed to select the first one.
>
> darrinps wrote:
>>
>> When I try to merge my_change_branch to my_trunk_test_branch, everything
>> goes great in that the files in my_trunk_test_branch are updated with the
>> changes from my_change_branch BUT none of the new files that got added to
>> change_branch (which my_change_branch is cut from) are NOT being added!
>> SOME of the new files I added to my_change_branch appear to be added back
>> into my_trunk_test_branch though.
>>
>> What could it be that I am doing wrong for this to happen?

I'm sorry, which first option? Other people might run into this and find
your answer helpful.

Felix

P.S. Please don't top post

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-07-27 16:23:54 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.