RE: svn vs. git

2017-07-20 Thread Scott Aron Bloom
From: Nathan Hartman [mailto:hartman.nat...@gmail.com] Sent: Thursday, July 20, 2017 14:39 To: Subversion Subject: Re: svn vs. git On Thu, Jul 20, 2017 at 3:41 PM, Johan Corveleyn > wrote: Not wanting to start a flame

RE: How to maintain a release branch?

2016-11-20 Thread Scott Aron Bloom
For my company, we do the following. For externals, use the pegging format We copy every release to our releases branch https://XXX/svn/releases/major.minor.svnrev For released bugs, that are to be fixed via patch release, the policy is to fix it on the branch and then merge it to trunk. When

svn command for diffstat

2016-07-14 Thread Scott Aron Bloom
What is the best svn diff options to use to pipe into diffstat. Essentially, Im looking for the number of new lines, deleted lines and number of modified. My main problem is when a svn diff is performed on a directory copy, I don't want those files counted as "added" Scott

RE: Facing issue in SVN pre commit hook | svnlook cat

2015-06-25 Thread Scott Aron Bloom
If the variable $TXN contains a *, it is getting expanded by the echo command, unix is expanding that before the echo is called. I would put single around the variable on your echo command From: Dhiraj Prajapati [mailto:dhiraj.prajap...@games24x7.com] Sent: Thursday, June 25, 2015 1:10 AM To:

bug or a feature :)

2015-05-06 Thread Scott Aron Bloom
So I noticed something.. We use svn:externals quite a bit, using the format -r 1234 ^/externals/ lcldr And it works just fine, we never moved to the new format of ^/externals/@1234 However, recently, we found that in restructuring one of our externals directory, which caused to

RE: Issue in svn E195020

2015-04-06 Thread Scott Aron Bloom
= I did notice that... (the version being the same for Prerequisites) Here is the line from the externals definition -r 28594 ^/externals/microsoft/Prerequisites Prerequisites It is a directory, that contains the VS 2013 and VS 2008 pre-req distribution

RE: Issue in svn E195020

2015-04-01 Thread Scott Aron Bloom
[ As an aside: this list prefers bottom-posting (i.e. putting your reply at the bottom) or inline replying, if possible. Also, plain-text is preferred, but I'll manage :-). See more below ... ] [ Understood... too many mailing lists.. ] On Wed, Apr 1, 2015 at 3:36 AM, Scott Aron Bloom sc

RE: Issue in svn E195020

2015-03-31 Thread Scott Aron Bloom
28492. At revision 29395. $ svnversion 28594:29395S $ svn merge --allow-mixed-revisions ^/branches/vijay/vhdlBitWidthFix_1 . svn: E195020: Cannot merge into mixed-revision working copy [28594:29395]; try updating first From: Scott Aron Bloom [mailto:sc...@towel42.com] Sent: Tuesday, March 31

RE: Issue in svn E195020

2015-03-31 Thread Scott Aron Bloom
) To: Scott Aron Bloom sc...@towel42.com Cc: users@subversion.apache.org Subject: Re: Issue in svn E195020 On Tue, Mar 31, 2015 at 2:56 AM, Scott Aron Bloom sc...@towel42.com wrote: ~~Scott Original message From: Johan Corveleyn jcor...@gmail.com Date:03/30/2015 12:48 (GMT-08:00

RE: Issue in svn E195020

2015-03-31 Thread Scott Aron Bloom
The stackoverflow issue seems to be similar, I cant confirm it's the same issue however, since there is no tell tail sign of failure However, I am using 1.8.11, and the article implies this bug has been fixed since 1.7.0 Scott From: Scott Aron Bloom [mailto:sc...@towel42.com] Sent: Tuesday

RE: Issue in svn E195020

2015-03-30 Thread Scott Aron Bloom
~~Scott Original message From: Johan Corveleyn jcor...@gmail.com Date:03/30/2015 12:48 (GMT-08:00) To: Scott Aron Bloom sc...@towel42.com Cc: users@subversion.apache.org Subject: Re: Issue in svn E195020 Its has been common, that after the merge, if another merge

Issue in svn E195020

2015-03-30 Thread Scott Aron Bloom
Running svn from tortoise (1.8.11 r1643975) but we have the same issue with the same version from VisualSVN, as well as the collabnet on linux Unfortunately, this is going to be a problem to duplicate this since its only on our full source repository. We work with a bunch of branches, but