Larry Streepy <larry@lightspeed.com>

r862862 | blair | 2006-12-24 01:38:54 +0000 (Sun, 24 Dec 2006)

Using svnmerge.py, when init'ing a directory, check if the source of
merges is actually a branch from the directory.  This is useful if one
is merging changes back into a trunk that came from a branch of the
trunk.

* svnmerge.py
  (action_init):
    If the revision range is not specified, then check if the source
      of merges is a branch of the directory being init'ed.

Patch by: Larry Streepy <larry@lightspeed.com>
(Tweaked by me.)