Re: Is it safe to remove deleted and no longer used branches from the svn:mergeinfo property?

2017-06-02 Thread Thomas Wicklund
On 5/31/2017 9:18 AM, Alfred von Campe wrote: After many years of development, we have over 100 entries in the svn:mergeinfo property of our trunk. I am thinking about manually editing the property to remove entries for all branches that have been deleted or are no longer used (and should be d

Re: svn feature addition?

2017-06-02 Thread Ryan Schmidt
On Jun 1, 2017, at 18:58, Branko Čibej wrote: >> -Is there an option to inspect each file further line-by-line for >> lines that have changed to either be selected or excluded from the commit? > > "Including or excluding changed lines from a file before commnt" is also > known as "usin

Re: Is it safe to remove deleted and no longer used branches from the svn:mergeinfo property?

2017-06-02 Thread Stefan Hett
Hi Alfred, On 6/2/2017 2:48 PM, Mark Phippard wrote: Actually, this is the newer tool I was thinking of: http://svn.apache.org/repos/asf/subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/ On Fri, Jun 2, 2017 at 8:46 AM, Mark Phippard > wrote: Have you

Fwd: Checksum mismatch after resolving conflicts in SVN

2017-06-02 Thread Daniel Shahaf
(Forwarding to the right list.) Akshaya wrote on Fri, 02 Jun 2017 00:07 -0700: > Hi, > > What will be the reason for checksum mismatch error after resolving > conflicts in svn? > After resolving conflicts, commit is successful but ended in checksum > mismatch in server. > > Thanks, > Nachu >

svn feature addition?

2017-06-02 Thread Eggler, Ron (GE Energy Connections)
[snip] > > -When you do svn commit, instead of automatically submitting all > > changed files in the directory, in the dialog where you enter the > > commit message (if -m flag is not used), is there a feature to uncheck > > any files that should not be committed/select files to be committe

RE: svn feature addition?

2017-06-02 Thread Andrew Reedick
> From: Eggler, Ron (GE Energy Connections) [mailto:ron.egg...@ge.com] > Sent: Thursday, June 1, 2017 7:44 PM > To: users@subversion.apache.org > Subject: svn feature addition? > > Hi There, > > I am looking for the following features in svn: > - When you do svn commit, instead of automatically

Re: Is it safe to remove deleted and no longer used branches from the svn:mergeinfo property?

2017-06-02 Thread Mark Phippard
Actually, this is the newer tool I was thinking of: http://svn.apache.org/repos/asf/subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/ Mark On Fri, Jun 2, 2017 at 8:46 AM, Mark Phippard wrote: > Have you seen this script? > > http://svn.apache.org/repos/asf/subversion/trunk/tools/ >

Re: Is it safe to remove deleted and no longer used branches from the svn:mergeinfo property?

2017-06-02 Thread Mark Phippard
Have you seen this script? http://svn.apache.org/repos/asf/subversion/trunk/tools/client-side/mergeinfo-sanitizer.py I believe it does this though I have never tried it. Mark On Wed, May 31, 2017 at 11:18 AM, Alfred von Campe wrote: > After many years of development, we have over 100 entrie

RE: Is it safe to remove deleted and no longer used branches from the svn:mergeinfo property?

2017-06-02 Thread Cooke, Mark
> -Original Message- > From: Alfred von Campe [mailto:alf...@von-campe.com] > Sent: 02 June 2017 13:40 > > On Jun 2, 2017, at 8:25, Nico Kadel-Garcia wrote: > > > I suspect you're going to hurt yourself if you try this sort of stunt. > > Not that it might not work in theory for some cases

Re: Is it safe to remove deleted and no longer used branches from the svn:mergeinfo property?

2017-06-02 Thread Alfred von Campe
On Jun 2, 2017, at 8:25, Nico Kadel-Garcia wrote: > I suspect you're going to hurt yourself if you try this sort of stunt. > Not that it might not work in theory for some cases, but it's not > tested and is against the basic "never, never, never, and did I > mention never alter history" approach t

Re: Is it safe to remove deleted and no longer used branches from the svn:mergeinfo property?

2017-06-02 Thread Nico Kadel-Garcia
On Fri, Jun 2, 2017 at 7:15 AM, Alfred von Campe wrote: > On May 31, 2017, at 11:18, I wrote: > > After many years of development, we have over 100 entries in the > svn:mergeinfo property of our trunk. I am thinking about manually editing > the property to remove entries for all branches that hav

Re: Is it safe to remove deleted and no longer used branches from the svn:mergeinfo property?

2017-06-02 Thread Alfred von Campe
On May 31, 2017, at 11:18, I wrote: > After many years of development, we have over 100 entries in the > svn:mergeinfo property of our trunk. I am thinking about manually editing > the property to remove entries for all branches that have been deleted or are > no longer used (and should be del

Re: svn feature addition?

2017-06-02 Thread Johan Corveleyn
On Fri, Jun 2, 2017 at 1:43 AM, Eggler, Ron (GE Energy Connections) wrote: > Hi There, > > I am looking for the following features in svn: > > -When you do svn commit, instead of automatically submitting all > changed files in the directory, in the dialog where you enter the commit > messa

Re: Checksum mismatch after resolving conflicts in SVN

2017-06-02 Thread Johan Corveleyn
[ Rerouting this to the users@subversion.apache.org mailinglist (bcc: subversion-developm...@googlegroups.com) --- users@s.a.o is the primary channel of the Apache Subversion project for users. More below ... ] On Fri, Jun 2, 2017 at 9:07 AM, Akshaya wrote: > Hi, > > What will be the reason for c