RE: reintegrate merge failing because "can only be used if revisions were previously merged", but it's a lie (I think?)

2015-05-21 Thread Charlet, Ricky
FYI, I set up a copy of my branch and ran the propdel advice there and checked in. And Andreas, you do seem to be right... a reintegration (dry-run) into trunk from my copy-of-branch makes a very good first impression on me: 3700+ changes with only 13 conflicts, most of which I comprehe

RE: reintegrate merge failing because "can only be used if revisions were previously merged", but it's a lie (I think?)

2015-05-21 Thread Charlet, Ricky
I really appreciate your help, but I'm still trying to comprehend. If I do the `svn propdel -R svn:mergeinfo; svn revert .` in my branch, I wind up clearing out mergeinfo on 8000+ files: ( I collected a `svn pg svn:mergeinfo` before and after the operation. Using wc -l to get a sense of how muc

RE: reintegrate merge failing because "can only be used if revisions were previously merged", but it's a lie (I think?)

2015-05-21 Thread Charlet, Ricky
Thanks Andreas, I've been playing around with the mergeinfo deletions as you suggested. I have not yet committed anything. It appears to me, if I do this at the top level of my trunk working copy, I will lose almost all my merge history. That seems pretty bad... -- Ricky Charlet -

Re: Compiling Subversion

2015-05-21 Thread Nico Kadel-Garcia
On Wed, May 20, 2015 at 7:21 AM, Chandra, Ramesh H.S. IN BLR STS wrote: > NOTE : In our company, there is a policy that internet access > will not be given to machines having Ubuntu OS. So, I cannot use “apt-get > install ” . You need to talk to your admins about setting up an intern

Re: Obtaining log messages for a diff

2015-05-21 Thread Nicolai Scheer
Hi Johan, On 19 May 2015 at 15:47, Nicolai Scheer wrote: > Hi Johan, > > On 18 May 2015 at 15:44, Johan Corveleyn wrote: >> >> On Mon, May 18, 2015 at 2:59 PM, Nicolai Scheer >> wrote: >> > Hi all, >> > >> > we run our subversion repository with a rather standard layout, e.g.: >> > >> > /trunk