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
mailto:jcor...@gmail.com>> wrote:
Not wanting to start a flame war, but for all svn users and admins out there
th
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 t
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
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: Br
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
>
> =
> 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
>
[ 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
GALibraries':
External at revision 29142.
Fetching external item into 'UI\QtGraphVizLib\libcgraphviz':
External at revision 28492.
At revision 29395.
$ svnversion
28594:29395S
$ svn merge --allow-mixed-revisions ^/branches/vijay/vhdlBitWidthFix_1 .
svn: E195020: Cannot merge into
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
Sorry, I misunderstood your question. Svn up succeeds but does not fix th3
svn merge issue.
I'll look at the stack overflow issue since we do have a bunch of externals.
~~Scott
Original message
From: Johan Corveleyn
Date:03/31/2015 02:29 (GMT-08:00)
To: Scott Aron
~~Scott
Original message
From: Johan Corveleyn
Date:03/30/2015 12:48 (GMT-08:00)
To: Scott Aron Bloom
Cc: users@subversion.apache.org
Subject: Re: Issue in svn E195020
> Its has been common, that after the merge, if another merge is attempted we
> get the E195020
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 somet
12 matches
Mail list logo
