[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: svn commit: r1401915 - in /subversion/trunk/subversion: libsvn_client/merge.c tests/cmdline/merge_tests.py

From: Bert Huijben <bert_at_qqmail.nl>
Date: Thu, 25 Oct 2012 01:20:57 +0200

> -----Original Message-----
> From: pburba_at_apache.org [mailto:pburba_at_apache.org]
> Sent: donderdag 25 oktober 2012 01:14
> To: commits_at_subversion.apache.org
> Subject: svn commit: r1401915 - in /subversion/trunk/subversion:
> libsvn_client/merge.c tests/cmdline/merge_tests.py
>
> Author: pburba
> Date: Wed Oct 24 23:14:12 2012
> New Revision: 1401915
>
> URL: http://svn.apache.org/viewvc?rev=1401915&view=rev
> Log:
> Prevent segfault when merge target has file externals with mergeinfo.
>
> See http://svn.haxx.se/dev/archive-2012-10/0364.shtml
>
> * subversion/libsvn_client/merge.c
>
> (get_wc_explicit_mergeinfo_catalog): Prune file externals with explicit
> mergeinfo from the catalog.
>
> * subversion/tests/cmdline/merge_tests.py
>
> (merge_with_externals_with_mergeinfo): New regression test.
>
> (test_list): Add merge_with_externals_with_mergeinfo.

Shouldn't this fix be applied to every switched paths below a directory instead of just on file externals specifically?

Or is there some other subsystem that denies merges in this situation?

        Bert
Received on 2012-10-25 01:21:46 CEST

This is an archived mail posted to the Subversion Dev mailing list.