Please use reply all to keep things on the list. Also please don't top-post, i.e. respond inline or at the bottom. More below ...
On 4 Aug 2013 22:45, "Z W" <mpc8...@gmail.com> wrote: > > Hi Johan > > Thanks for responding. > We are using 1.6 client. > 1- Will reintegrate work ? I think so, but YMMV, and you won't benefit from all the bug fixes of 1.7 and 1.8. Also, since the 1.8 release, 1.6 is not supported any more. You should upgrade as soon as you can. > 2- If using reintegrate fails, could we revert -R safely ? Yes, that should always work, provided you started with a clean working copy (no local modifications). > 3- Do we still need to revert the couple of unwanted changes / files when using with --reintegrate option ? > Yes, because those files will be added by the merge, if I understand correctly, and you don't want them committed. -- Johan > Sincerely > > > > On Sun, Aug 4, 2013 at 9:51 AM, Johan Corveleyn <jcor...@gmail.com> wrote: >> >> >> On 4 Aug 2013 05:44, "Z W" <mpc8...@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 > >
