Re: Merging Branches with MS Access Database

Jason Lepack wrote:
> TortoiseSVN 1.4.5 r8095, FSFS, accessed using file:///
> I have two branches, trunk and development, in my repository. In the trunk
> repository is are two different MS Access Databases, one is the backend, the
> other is the front end. In the development branch I modified these two
> databases and added a second front-end for a different class of user.
> I just recently started with branching, so I need some help.
> The Development branch is now stable and I'd like it to be the data that's
> in the trunk. How do I do this? I tried to use merge, but it tells me that
> the two modified dbs are conflicted, and I don't know how to resolve them.
> I read the documentation but it talks about merging within the same branch,
> which makes me think that I may be going about this wrong.
> I apprectiate your time and efforts in assisting me with this.

   I'd be really surprised if you could successfully merge changes in a binary format like
an Access database. SVN would need to understand the Access database format, which it doesn't.

   I think you'll need to combine your two databases together by hand, using Access
itself, because SVN can't help you here.

> Jason Lepack

-- 
      Chris 'Xenon' Hanson | Xenon @ 3D Nature | http://www.3DNature.com/
  "I set the wheels in motion, turn up all the machines, activate the programs,
   and run behind the scenes. I set the clouds in motion, turn up light and sound,
   activate the window, and watch the world go 'round." -Prime Mover, Rush.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org