Re: Merge problems

Hello-

  I had the same issue with a merge simply displaying "Finished!"
without bringing any files over to my working copy.

  I'm using the daily build that was posted yesterday for XP 64-bit,
and our svn server is still running 1.4.

  The operation I was trying to do was just to bring a few files that
I'd just checked into a branch over into the trunk.

  Both the branch and the trunk I had created piecemeal using the new
sparse checkout facilities.

  Here is the command that was generated (stripping company & product
name):

> Command: Merging revisions 1717-1718 of http://192.168.1.7/svn/ourCompany/branches/Product1_7.01_Product2_2.0 into D:\Product_Dev\trunk, respecting ancestry, Test Only

  This seems to be the same thing I did using prior versions of
tortoise, or at least how I interacted with the dialog was very
similar, apart from not having to type in the previous revision number
up to the single revison I want to bring over.

  Anyway, this would not work. However, last night I destroyed my
local trunk and did a fresh (and complete... no longer sparse!)
checkout. And now it works as it used to.

  I hope this is helpful, and thank you for your work on Tortoise :o)

-Baker

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: dev-help_at_tortoisesvn.tigris.org
Received on 2008-08-15 17:11:59 CEST