Mark Eichin <eichin@gmail.com>

Found	Patch
r1102901, r876687, r874636, r874634	r874497

r874497 | pburba | 2008-11-25 19:21:18 +0000 (Tue, 25 Nov 2008)

Fix issue #3312 "Mergeinfo for '...' maps to an empty revision range" due
to sparse merging.

Patch by: Mark Eichin <eichin@gmail.com>

* subversion/include/svn_mergeinfo.h
  (svn_mergeinfo_inheritable): Tweak doc string.

* subversion/libsvn_subr/mergeinfo.c
  (svn_mergeinfo_inheritable): Do not return paths mapped to empty
  rangelists, this is not permitted by the svn:mergeinfo syntax.

r874634 | pburba | 2008-12-04 18:38:22 +0000 (Thu, 04 Dec 2008)

Add a test for a bug which occurs when a merge adds a subtree as an
immediate child of the merge target when the merge target 
has non-inheritable mergeinfo and is also the current working directory.

See http://svn.haxx.se/dev/archive-2008-12/0133.shtml.

Found by: Mark Eichin <eichin@gmail.com>

* subversion/tests/cmdline/merge_tests.py
  (merge_away_subtrees_noninheritable_ranges): Expand this existing
  test, which already deals with non-inheritable mergeinfo, to cover this
  new bug.
  (test_list): Mark merge_away_subtrees_noninheritable_ranges as XFail.

r874636 | pburba | 2008-12-04 19:13:37 +0000 (Thu, 04 Dec 2008)

Fix a bug which occurs when a merge adds a subtree as an immediate child of
the merge target when the merge target has non-inheritable mergeinfo and
is also the current working directory.

See http://svn.haxx.se/dev/archive-2008-12/0133.shtml.

Found by: Mark Eichin <eichin@gmail.com>

* subversion/libsvn_client/merge.c
  (do_directory_merge): Be more careful about constructing valid mergeinfo.

* subversion/tests/cmdline/merge_tests.py
  (merge_away_subtrees_noninheritable_ranges): Remove comment about XFail.
  (test_list): Remove XFail from merge_away_subtrees_noninheritable_ranges.

r876687 | pburba | 2009-03-17 00:22:43 +0000 (Tue, 17 Mar 2009)

Avoid potential segfaults caused by NULL elements in the
CHILDREN_WITH_MERGEINFO array by removing elements rather than setting them
to NULL.

Found by: Mark Eichin <eichin@gmail.com>

See http://svn.haxx.se/dev/archive-2009-03/0382.shtml.

* subversion/libsvn_client/merge.c
  (CHILDREN_WITH_MERGEINFO ARRAY): Tweak this global comment.
  (populate_remaining_ranges, drive_merge_report_editor, do_directory_merge):
  Check for NULL children_with_mergeinfo elements with SVN_ERR_ASSERT.
  (remove_child_with_mergeinfo): New. 
  (remove_absent_children, remove_children_with_deleted_mergeinfo): Use
  remove_child_with_mergeinfo() to truly remove elements rather than setting
  them to NULL.

r1102901 | cmpilato | 2011-05-13 21:20:23 +0000 (Fri, 13 May 2011)

Fix a silly buglet:

   $ svnrdump dump -r4:HEAD file:///path/to/repos
   svnrdump: E205000: Unsupported revision specifier used; use only
   integer values or 'HEAD'

* subversion/svnrdump/svnrdump.c
  (validate_and_resolve_revisions): Resolve revisions of kind
    svn_opt_revision_head to the HEAD revision (which we conveniently
    have as 'latest_revision').

Found by: Mark Eichin <eichin@gmail.com>