Return-Path: X-Original-To: apmail-subversion-users-archive@minotaur.apache.org Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 73B7118E67 for ; Thu, 12 Nov 2015 20:02:03 +0000 (UTC) Received: (qmail 65602 invoked by uid 500); 12 Nov 2015 20:02:02 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 65560 invoked by uid 500); 12 Nov 2015 20:02:02 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Delivered-To: moderator for users@subversion.apache.org Received: (qmail 29948 invoked by uid 99); 12 Nov 2015 19:53:00 -0000 X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 2.899 X-Spam-Level: ** X-Spam-Status: No, score=2.899 tagged_above=-999 required=6.31 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HTML_MESSAGE=3, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001] autolearn=disabled Authentication-Results: spamd4-us-west.apache.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:mime-version:to:from:subject:date:importance :content-type; bh=k+CJVk96KyJkMIlbi94jqfKnZsG8KUuE1xQSPQVJGEA=; b=R8QFyi4f5seKTopFnBgicMPDQSWzFwwVEdpLUnfLAbAHLkv0/Lq1hp0Drn+X2CT7b0 ZyvSTQ8w6f/NWX5HuwrdLJZo/LM4o48/2fq1/P0FcHDaKwnmwmJFLTlntb2iUFa60eFF Bw2MgNp8XFGlyFgkSvDeVjmrdW6U++ELo30KS/3Pb641brctQokXR67vp7ZWGsIgjvnk vqhW8LmmjxBdja8Rq63CH1xUGqmO4iFlgzoYSt5J8jMicqrU0Nr9QWJoqUfDQ9UZs7zv ZN3LMPYSUIj+COWWe23cLR+g6V+kxksiv3rxLOKq7IW+21AwevEpr45X9wmkewXzUxu8 IWcA== X-Received: by 10.129.156.79 with SMTP id t76mr18742327ywg.71.1447357970740; Thu, 12 Nov 2015 11:52:50 -0800 (PST) Message-ID: <5644ee12.87f80d0a.8dc37.ffffc3db@mx.google.com> MIME-Version: 1.0 To: "users@subversion.apache.org" From: Subject: Error in trying to test merge Date: Thu, 12 Nov 2015 14:52:48 -0500 Importance: normal X-Priority: 3 Content-Type: multipart/alternative; boundary="_33FE5693-A963-44B0-B44B-96B60B533CA7_" --_33FE5693-A963-44B0-B44B-96B60B533CA7_ Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The error does not happen if I chose =E2=80=98Do a reintegrate instead of = an automatic merge (old style)=E2=80=99 --------------------------- Subversion Exception! --------------------------- Subversion encountered a serious problem. Please take the time to report this on the Subversion mailing list with as much information as possible about what you were trying to do. But please first search the mailing list archives for the error message to avoid reporting the same problem repeatedly. You can find the mailing list archives at http://subversion.apache.org/mailing-lists.html Subversion reported the following (you can copy the content of this dialog to the clipboard using Ctrl-C): In file 'D:\Development\SVN\Releases\TortoiseSVN-1.9.2\ext\subversion\subversion\l= ibsvn_client\merge.c' line 4889: assertion failed (*gap_start < *gap_end) --------------------------- OK =20 --------------------------- Similar to this error:=20 http://svn.haxx.se/users/archive-2014-06/0087.shtml Sent from Mail for Windows 10 --_33FE5693-A963-44B0-B44B-96B60B533CA7_ Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset="utf-8"

The error does not happen=C2=A0 if I= chose =E2=80=98Do a reintegrate instead of an automatic merge (old style)= =E2=80=99

---------------------------

Subversion Exception!<= /p>

---------------------------

Subversion encountered a serious problem.

Please t= ake the time to report this on the Subversion mailing list

with as much information as possible about what

you were trying to do.

But please first search= the mailing list archives for the error message

to= avoid reporting the same problem repeatedly.

You c= an find the mailing list archives at

http://subvers= ion.apache.org/mailing-lists.html

=

Subversion reported the following

(you can copy the content of this dialog

to= the clipboard using Ctrl-C):

=

In file

'D:\Development\SVN\R= eleases\TortoiseSVN-1.9.2\ext\subversion\subversion\libsvn_client\merge.c'<= /p>

line 4889: assertion failed (*gap_start < *gap_= end)

---------------------------

OK=C2=A0=C2=A0

---------------------------

Similar to= this error:

http://svn.haxx.se/users/archive-2014= -06/0087.shtml

Sent from Mail for Windows 10

= --_33FE5693-A963-44B0-B44B-96B60B533CA7_--