Re: Merge problems

I forgot to mention, I was able to get the first merge to work (with
both trunk and branch 'sparse') by not doing the merge at the root or
trunk level, but digging down into the folder where the change was I
wanted to bring over (it was really only one file).

so instead of:

  branches/productBranch
  to
  trunk/

  I did:

  branches/ProductBranch/code
  to
  trunk/code

And that worked when they were both sparse.

I tried to create the sparse branches according to the instructions,
and SVN Update appears to work fine.

Thanks again,
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:21:52 CEST