Archie Cobbs <archie@awarix.com> (archiecobbs)


Patch Review
r867422, r856102, r855403, r854706, r854532, r854082, r853216, r851510, r850075 r863126

r867422 | dustin | 2007-10-24 09:36:27 -0500 (Wed, 24 Oct 2007)

* contrib/client-side/svnmerge/svnmerge.py
  (display_revisions, command_table): add '--summarize' option,
   pass it to 'svn diff'.

Patch by: Archie Cobbs <archie@dellroad.org>
Review by: Giovanni Bajo <rasky@develer.com>
           Jon Schewe <jpschewe@mtu.net>


r863126 | dlr | 2007-01-16 17:37:56 -0600 (Tue, 16 Jan 2007)

Make multiple invocations of 'svn merge' from an invocation of
'svnmerge.py merge' behave like the combined merge in cases where an
'svn merge' produces a local modifications which interfere with a
subsequent 'svn merge'.

As svnmerge.py runs only in clean working copies, the only possible
local modifications are those produed by svnmerge.py itself: here we
*REALLY* want --force.  See the following message and surrounding
email thread:

Date: Thu, 11 Jan 2007 00:03:17 +0100
From: Giovanni Bajo <rasky@develer.com>
Subject: Re: [Svnmerge] Bugs when merging revisions that modify and deletefiles
Message-ID: <45A570B5.1040100@develer.com>


* contrib/client-side/svnmerge.py
  (action_merge, action_rollback): Add the --force to invocation of
   the Subversion command-line binary's 'merge' command.

Patch by: Tilmann Singer <tils@tils.net>
(Tweaked by me.)
Reviewed by: giovannibajo
             archiecobbs


r856102 | archiecobbs | 2005-09-02 11:07:16 -0500 (Fri, 02 Sep 2005)

* contrib/client-side/svnmerge:
  Shell portability fix.


r855403 | archiecobbs | 2005-07-12 12:43:01 -0500 (Tue, 12 Jul 2005)

* trunk/contrib/client-side/svnmerge:
  Disallow merged-in changes to the "svnmerge-integrated" property when
  doing a merge; instead, we want to enforce that all merge tracking updates
  are done as a result of explicit action by the user.

  This fixes some problems when doing bi-directional merges and
  when doing merges into a directory through multiple paths.


r854706 | archiecobbs | 2005-05-08 12:37:44 -0500 (Sun, 08 May 2005)

* trunk/contrib/client-side/svnmerge:
  - Portability fix: avoid "head -1" which is not 100% portable.


r854532 | archiecobbs | 2005-04-26 17:20:00 -0500 (Tue, 26 Apr 2005)

* trunk/contrib/client-side/svnmerge:
  - Fix breakage when merge target has svn:externals subdirectories.
  - Fix a couple of typos (test(1) uses "=" not "==").


r854082 | archiecobbs | 2005-04-07 08:58:56 -0500 (Thu, 07 Apr 2005)

* trunk/contrib/client-side/svnmerge:
  - Fix bug in r12924: we changed the -H flag to -S but forgot to update
    the string passed to getopt(1) accordingly.


r853216 | archiecobbs | 2005-02-24 09:19:36 -0600 (Thu, 24 Feb 2005)

* trunk/contrib/client-side/svnmerge:
  - A more correct version of the previous commit (r13141) using LC_MESSAGES.

Suggested by: Peter N. Lundblad <peter@famlundblad.se>


r851510 | archiecobbs | 2004-10-16 09:44:30 -0500 (Sat, 16 Oct 2004)

Add support to the 'svnmerge' tool for unique labels embedded in the merge
tracking property names. Provide a new command line flag -L to specify a
specific label to use.

This adds support for two situations where 'svnmerge' didn't work due to
properties with the same name conflicting:

  1. When there are multiple 'head' dirs from which merges are being tracked
  2. When the 'head' tree is itself tracking merges from yet another 'head'
     (e.g., when two trees are tracking merges from each other)

* contrib/client-side/svnmerge:
  Added support for unique property labels using the -L flag 


r850075 | sussman | 2004-06-14 23:39:45 -0500 (Mon, 14 Jun 2004)

Book tweaks.

Patch by: Archie Cobbs <archie@dellroad.org>
(Tweaked by me.)

* doc/book/book/ch09.xml (svnlook diff):  show normal output for
  binary-marked files.  Note that non-textual mime-types don't show
  their diffs.