RE: just upgraded to svn 1.5 - confused

2011-04-29 Thread Bob Archer
> On Thu, Apr 28, 2011 at 20:27, Totte Karlsson > wrote: > > Someone said that merges are easy.. I have read the svn book > about merges > > but it does not help. > > > > I create a branch and I can keep it synchronized with the trunk. > > I can even re-integrate the branch with the trunk. > > > >

Re: just upgraded to svn 1.5 - confused

2011-04-29 Thread Totte Karlsson
Ff after you re-integrate you merge that rev from trunk with --record-only you can keep using the same branch. But, yes for the most part, "reintegrate" is designed for feature branches which are generally not used/needed after the feature is reintegrated into trunk. I am sometimes using tor

Re: Windows SSL Error

2011-04-29 Thread Konstantin Kolinko
2011/4/26 Platz, Steve : > Our Entrust SSL certificate recently expired and was replaced with a new one > utilizing a certificate chain.  Since installing the new certificate, access > to a front-end website using this same certificate has been unaffected. > However, we’re now seeing issues when we

Re: Merging two projects in two different repos

2011-04-29 Thread List Man
Svnsync does not allow the project/sub-directory in this case to be updated in the future, according to what I read. Is this information incorrect? I have never used svnsync before. TIA, On Apr 28, 2011, at 8:58 AM, Daniel Shahaf wrote: > Ulrich Eckhardt wrote on Thu, Apr 28, 2011 at 12:2

Re: Merging two projects in two different repos

2011-04-29 Thread Les Mikesell
No, but if you don't have file access to the source repository you can use svnsync to copy it to a location where you do have access. Then you can svnadmin dump/filter and load to your desired project location. The dump/filter/load is a one-time process and has the problems of making your dat