httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Rainer Jung <rainer.j...@kippdata.de>
Subject Re: mergeinfo ignorance
Date Mon, 23 Jul 2012 17:27:42 GMT
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 the svn.merge script which, for the curious, does a simple
>> diff and patch.
>
> The one I use at http://people.apache.org/~jorton/svn.merge does use
> "svn merge" correctly (I hope!), possibly an older version didn't?

Nice.

You can nowadays shortcut

-r${prev}:${rev}

by

-c $rev

and no longer need the prev. That was an svn improvement I found very handy.

Regards,

Rainer


Mime
View raw message