Re: merging and ignoring certain directories

2013-08-04 Thread Johan Corveleyn
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" 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

Re: merging and ignoring certain directories

2013-08-04 Thread Johan Corveleyn
On 4 Aug 2013 05:44, "Z W" 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 h

merging and ignoring certain directories

2013-08-03 Thread Z W
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 o