I for sure don't use 'svn merge' and am likely guilty (and the
orig post clearly indicates) of this... For awhile, svn merge
was as wonky as hell, so I simply skipped using it and instead
used the svn.merge script which, for the curious, does a simple
diff and patch.
I'm guessing that things are
Is this still useful: svnmerge.py ?
http://www.orcaware.com/svn/wiki/Svnmerge.py
On Jul 23, 2012, at 8:45 AM, Jim Jagielski wrote:
I for sure don't use 'svn merge' and am likely guilty (and the
orig post clearly indicates) of this... For awhile, svn merge
was as wonky as hell, so I
On 23.07.2012 17:55, Jim Jagielski wrote:
Is this still useful: svnmerge.py ?
http://www.orcaware.com/svn/wiki/Svnmerge.py
A quick check of
http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/svnmerge/
and the mailing list activity suggests, that there isn't much going
Nah... obsoleted by merge tracking (svn:mergeinfo) with the svn 1.5 release.
Please ignore that script and use svn merge.
And also that svn is a TLP sibling nowadays can surely help :-)
Cheers,
-g
On Jul 23, 2012 10:56 AM, Jim Jagielski j...@jagunet.com wrote:
Is this still useful:
On Mon, Jul 23, 2012 at 08:45:47AM -0400, Jim Jagielski wrote:
I for sure don't use 'svn merge' and am likely guilty (and the
orig post clearly indicates) of this... For awhile, svn merge
was as wonky as hell, so I simply skipped using it and instead
used the svn.merge script which, for the
On 23.07.2012 19:21, Joe Orton wrote:
On Mon, Jul 23, 2012 at 08:45:47AM -0400, Jim Jagielski wrote:
I for sure don't use 'svn merge' and am likely guilty (and the
orig post clearly indicates) of this... For awhile, svn merge
was as wonky as hell, so I simply skipped using it and instead
used
Jim Jagielski wrote on Mon, Jul 23, 2012 at 11:55:32 -0400:
Is this still useful: svnmerge.py ?
http://www.orcaware.com/svn/wiki/Svnmerge.py
For 1.4 repositories (regardless of server software version) yes. I'd
not use both svnmerge.py and 'svn merge' on the same branch, that's just
On 22.07.2012 16:14, Jeff Trawick wrote:
On Sun, Jul 22, 2012 at 9:48 AM, rj...@apache.org wrote:
Author: rjung
Date: Sun Jul 22 13:48:30 2012
New Revision: 1364302
URL: http://svn.apache.org/viewvc?rev=1364302view=rev
Log:
Add mergeinfo for backports done by jim in r1200981.
Is there a
CAUTION:
Always merge into a clean branch checkout and commit the whole branch. If
you start to only commit parts of the branch after merging, svn will produce
additional mergeinfo properties attached to sub directories or files. We
don't want that.
I might be a culprit here, I use
On 22.07.2012 16:59, Eric Covener wrote:
CAUTION:
Always merge into a clean branch checkout and commit the whole branch. If
you start to only commit parts of the branch after merging, svn will produce
additional mergeinfo properties attached to sub directories or files. We
don't want that.
I
10 matches
Mail list logo