Re: using patch to manage differences

On Thu, Nov 13, 2008 at 15:30, Kerry Carroll <carrolky_at_alumni.uc.edu> wrote:
> Please help. Bit of a newbie question.
>
> I have the same application in three separate environments, Lets call then
> A, B, and C. Each is identical except that each has configuration files
> that store environment specific settings (database connection strings,
> folder locations, etc.)

<snip>

> Is there a workaround or an option that I can specify to override this
> behavior (or force the merge)? I don't mind if there are conflicts for me
> to resolve. I just need the merge to to apply the patch.
>

I would suggest a variation on this process:
http://subversion.tigris.org/faq.html#ignore-commit

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-11-13 21:51:30 CET