Re: merging and ignoring certain directories
From: Johan Corveleyn <jcorvel_at_gmail.com>
Date: Mon, 5 Aug 2013 08:19:41 +0200
Please use reply all to keep things on the list. Also please don't
On 4 Aug 2013 22:45, "Z W" <mpc8250_at_gmail.com> wrote:
I think so, but YMMV, and you won't benefit from all the bug fixes of 1.7
> 2- If using reintegrate fails, could we revert -R safely ?
Yes, that should always work, provided you started with a clean working
> 3- Do we still need to revert the couple of unwanted changes / files when
Yes, because those files will be added by the merge, if I understand
-- Johan > Sincerely > > > > On Sun, Aug 4, 2013 at 9:51 AM, Johan Corveleyn <jcorvel_at_gmail.com> wrote: >> >> >> On 4 Aug 2013 05:44, "Z W" <mpc8250_at_gmail.com> wrote: >> > >> > Hi All >> > >> > We have a branch A >> > We svn copy A to feature branch Y >> > Time elapsed >> > We svn merge A to Y continuously >> > Time elapsed >> > We svn copy A to branch B (and decided B would be the "trunk") >> > Time elapsed >> > We have been merging B to Y continuously >> > We have been checking in jars to branch Y when making builds on Y. >> > Time elapsed >> > Time to merge back from Y to Trunk B >> > >> > Question 1: >> > We like to ignore the build artifacts in Y when merging back B. >> > How do we do that ? >> > What is the exact command ? >> >> One way to do this is to execute the 'svn merge' and then revert the couple of unwanted changes / files, before committing. >> >> > Question 2: >> > Would --reintegrate option help in this case ? >> >> It looks like a reintegration merge, so I guess --reintegrate will do the right thing. But if you use a 1.8 client, it will choose the correct kind of merge automatically. >> >> > Question 3: >> > We may not want to delete branch Y after merging to B. >> > Can Y continue development and NOT cause merging issues again when we need >> > to merge from Y to B the 2nd time and onward. >> > >> >> With a 1.8 client this should work fine. >> >> -- >> Johan > >Received on 2013-08-05 08:20:26 CEST
This is an archived mail posted to the Subversion Users mailing list.