On Wed, Apr 9, 2008 at 2:40 PM, Kamesh Jayachandran <kamesh_at_collab.net> wrote:
>
> Looks Fine Paul.
>
> +1 to commit.
>
> With regards
> Kamesh Jayachandran
Thanks for taking a look Kamesh. Committed in r30464 and nominated
for backport to 1.5.x. If you can please vote for it on STATUS.
Paul
> -----Original Message-----
> From: Paul Burba [mailto:ptburba_at_gmail.com]
> Sent: Wed 4/9/2008 10:58 PM
> To: Kamesh Jayachandran; Subversion Developers
> Subject: [PATCH]: Fix Reopened Issue #2821
>
> Kamesh,
>
> This fixes the problem we discussed today in issue
> http://subversion.tigris.org/issues/show_bug.cgi?id=2821#desc22 and
> passes merge_tests.py. How does this look to you?
>
> [[[
> Fix reopened issue #2821.
>
> See http://subversion.tigris.org/issues/show_bug.cgi?id=2821#desc22
>
> * subversion/libsvn_client/merge.c
> (drive_merge_report_editor): When describing subtrees of the merge
> target with differing mergeinfo there was a bug where we *didn't*
> consider a child not requiring any merge as a differing subtree. We
> must consider these and call reporter->set_path for these subtrees,
> otherwise the merge is repeated.
>
> * subversion/tests/cmdline/merge_tests.py
> (avoid_repeated_merge_on_subtree_with_merge_info): Remove comment
> about XFail status.
> (test_list): Remove XFail from
> avoid_repeated_merge_on_subtree_with_merge_info.
> ]]]
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-04-09 22:40:27 CEST