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

Re: Test merge fails, actual merge succeeds

From: Andrea <mariofutire_at_googlemail.com>
Date: Mon, 13 Jul 2009 22:28:31 +0100

On 13/07/09 19:16, Stefan Küng wrote:
> Andrea wrote:
>> Hi,
>>
>> I've had this situation (tortoise 1.6.3), connected to a server 1.5.X.
>>
>> I merge from branch 1 to branch 2 and I select rev 71 and from 87 to 89
>> in the gui.
>>
>> Then I test the merge and some files in 87,88,89 fail to be merged.
>> If I then run the actual merge everything works fine.
>>
>> Is it because changes 87-89 need 71 to apply properly? And Tortoise's
>> Test Merge always tries to merge on the working copy.
>> And then, when I do the actual merge 87 is applied on top of 71?
>
> The test merge is just that: a test. It doesn't run the whole merge, so
> the output is only guessed, not actually done. So while that guessing is
> really good, it can't be 100% accurate since that can only be done by
> actually executing the merge.
>
> Stefan
>

Thanks for the confirmation.
I should be ok with the full merge, which can always be reverted.

Thanks

Andrea

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-07-14 07:17:25 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.