Andy,
My problem with this approach is that there is a lot of information in these
files but only 2-10 lines in each that need to change in each environment.
Since there are so many of these files (see my reply to Bob) and so many
lines, the chance of introducing an error here is too great to have to do
this manually every time.
What I need is a relatively quick and reliable method for applying changes
to a set of files. This is why the patch approach seemed like the correct
direction. Again, I expect to need to resolve conflicts when there have
been changes between versions. After doing so, I can create a new patch
(actually overwrite the old patch) and commit these changes to my trunk
before creating a new tag. Following this process (again, in my mind at
least) should allow me to have a series of Tags, each with all the files for
exporting Environment A and patches for generating Environment B and
Environment C all within the same Tag.
I'm not sure I understand why whitespace would prevent me from applying the
patch. If this is the intended design, could a feature be added to ignore
whitespace differences if the user chooses to do so?
In the meantime, is there a way for me to apply the current patch?
On Thu, Nov 13, 2008 at 3:51 PM, Andy Levy <andy.levy_at_gmail.com> wrote:
> 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
>
>
--
Kerry Carroll
carrolky_at_alumni.uc.edu
Received on 2008-11-13 23:17:40 CET