Re: Problems merging with 1.6.2 client and 1.5.6 server

2010-02-09 Thread Michael Diers
Michael Diers wrote: > Clint Popetz wrote: >> Are there known issues merging between branches using a 1.6.2 client and >> a 1.5.6 server? > [...] > > Clint, > > there are problems with merges and indeed merge performance in that > client release. Some have since been addressed in more recent 1.6

Re: Problems merging with 1.6.2 client and 1.5.6 server

2010-02-09 Thread Michael Diers
Clint Popetz wrote: > Are there known issues merging between branches using a 1.6.2 client and > a 1.5.6 server? [...] Clint, there are problems with merges and indeed merge performance in that client release. Some have since been addressed in more recent 1.6 releases. I'd suggest you give the 1.

Problems merging with 1.6.2 client and 1.5.6 server

2010-02-07 Thread Clint Popetz
Hi, Are there known issues merging between branches using a 1.6.2 client and a 1.5.6 server? Here's what I'm seeing. I create a release branch with svn cp, commit changes to the head, and do `svn merge -cNNN ^/trunk/path` in the branch's working copy to backport a change to the branch. It takes