Re: Merge trunk and prod directories without workspace

2015-03-17 Thread Lathan Bidwell
On Mon, Mar 16, 2015 at 5:49 PM, Les Mikesell wrote: > On Mon, Mar 16, 2015 at 4:33 PM, Lathan Bidwell > wrote: > > > >> > >> I usually think in revision numbers or tag names instead of pretending > >> there was only one. If, instead of tracking HEAD, you copied each > >> release to a new TAG wi

Re: 1.8 bug(?): svn:mergeinfo set for tree-conflicted files in subdirs

2015-03-17 Thread Pete Harlan
On Mon, Mar 16, 2015 at 6:08 PM, Branko Čibej wrote: >>> In an ideal world, you colleague's argument would be wrong: the merge >>> should record what was actually merged, not what the merge command >>> intended. So, in cases as the one that started this discussion — when >>> part of the tree canno

Re: Reoganizing svn structure and error "shares no common ancestry"

2015-03-17 Thread Eric Johnson
Does switching to a new branch work before the reorganization that you did? What version of Subversion are you using? Can you reproduce the problem with a mock version of your repository? When you do an svn log of your new branch, does the history go back to a common revision with the new trunk?

SVN 1.8.x build fail

2015-03-17 Thread Chen, Peter
Hi, I'm attempting to build the 1.8.11 client on a sparc-solaris 2.10 machine Gcc-4.2.4 Autoconf-2.63 Libtool-2.4.3 (version that came w/ svn source) Apr/apr-util 1.x (the latest version that came when running get-deps.sh) My configure command was: configure --prefix=/home/Svn --with-zlib=/home/

Re: SVN 1.8.x build fail

2015-03-17 Thread Philip Martin
"Chen, Peter" writes: > My configure command was: > > configure --prefix=/home/Svn --with-zlib=/home/lib > --with-apr=/home/Svn --with-apr-util=/home/Svn --with-serf=/home/lib > --with-ssl --with-sqlite=/home/Svn --disable-mod-activation > > Here's the last few lines when I run gmake: > > ../../s

RE: SVN 1.8.x build fail

2015-03-17 Thread Chen, Peter
Hi Philip, Thanks for replying Yes, my svn-1.6.11 client uses APR-1.3.x. The APR-1.3.x files are in /home/bin, /home/lib, etc The APR-1.4.x files are located in /home/Svn/bin, /home/Svn/lib, etc Sorry, but I'm not that familiar w/ linking, but how do I ensure that the linker finds the right

Re: SVN 1.8.x build fail

2015-03-17 Thread Philip Martin
"Chen, Peter" writes: > Hi Philip, > > Thanks for replying > > Yes, my svn-1.6.11 client uses APR-1.3.x. > > The APR-1.3.x files are in /home/bin, /home/lib, etc > > The APR-1.4.x files are located in /home/Svn/bin, /home/Svn/lib, etc > > Sorry, but I'm not that familiar w/ linking, but how do

Re: Merge trunk and prod directories without workspace

2015-03-17 Thread Les Mikesell
On Tue, Mar 17, 2015 at 8:21 AM, Lathan Bidwell wrote: > >> > Also, these publishes are not like putting out a full release of a software > package. The entire branch is a website for a university. We never publish > everything at the same time. So, I'm not sure how I could implement a useful > TA

Re: Merge trunk and prod directories without workspace

2015-03-17 Thread Les Mikesell
On Tue, Mar 17, 2015 at 9:45 PM, Les Mikesell wrote: Sorry - accidentally sent before finished... > On Tue, Mar 17, 2015 at 8:21 AM, Lathan Bidwell wrote: >> >>> >> Also, these publishes are not like putting out a full release of a software >> package. The entire branch is a website for a unive