Re: Merging Branches with MS Access Database

On 02/10/2007, Jason Lepack <jlepack@gmail.com> wrote:
>
> I guess I didn't reply to the board. Here's as good as I can get it from
> memory...
>
> I only want to place the new databases, from Development, into trunk. I
> guess maybe I don't want to merge, do I have to just check out the trunk,
> move the new file into the direcotry and recommit? That sounds strange, but
> if there's no other method then that's what I must do.

You certainly have to checkout the trunk. You cannot modify existing
repository content without having a working copy, so there is no other
way to get the changes into trunk.

If you look at the docs again you will see two use case. The second is
about merging two different trees, which is what you are doing. If you
follow the method through you may still get conflicts on merge, if you
(or someone else) modified trunk after you created your branch. In the
Check for Modifications dialog you can use 'Resolve using mine' to
overwrite with your development version.

But if there are just 2 files involved, the easiest way is simply to
overwrite the trunk files with your development versions and commit.
The effect will be exactly the same.

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org