From users-return-13521-apmail-subversion-users-archive=subversion.apache.org@subversion.apache.org Mon Feb 6 13:24:47 2012 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 3EB0497E6 for ; Mon, 6 Feb 2012 13:24:47 +0000 (UTC) Received: (qmail 18573 invoked by uid 500); 6 Feb 2012 13:24:46 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 18386 invoked by uid 500); 6 Feb 2012 13:24:45 -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 66232 invoked by uid 99); 6 Feb 2012 10:23:26 -0000 X-ASF-Spam-Status: No, hits=0.6 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_MED,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (athena.apache.org: local policy) From: "Nancarrow, Tony" To: "users@subversion.apache.org" Date: Mon, 6 Feb 2012 10:22:47 +0000 Subject: Subversion exception while merging Thread-Topic: Subversion exception while merging Thread-Index: AczkuUWCZeqO0BiiSEG6XlV5yTg/tg== Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US Content-Type: multipart/alternative; boundary="_000_B4D8B652D9DBC3439BF0E9497284E3A2067DBFE079NHC0PURCMS001_" MIME-Version: 1.0 --_000_B4D8B652D9DBC3439BF0E9497284E3A2067DBFE079NHC0PURCMS001_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable I was merging revisions in a branch back to the trunk (which also had local= revisions). (Tortoise SVN merge type =3D "Merge a range of revisions"). I had 2 conflicting files which I manually merged (using Araxis Merge) to r= esolve the conflicts (and marked them as "resolved"). The error occurred at the end of the merge process. The whole merge process appears to have been successful with new files havi= ng been added and conflicts resolved. Using Tortoise SVN 1.7.4, Subversion client 1.7.2, Subversion server 1.6.11= . --------------------------- 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.7.4\ext\subversion\subversion\li= bsvn_wc\wc_db.c' line 4131: assertion failed (presence =3D=3D svn_wc__db_status_normal) --------------------------- OK --------------------------- Regards, Tony Nancarrow Tony Nancarrow Senior Software Engineer Cobham Tactical Communications and Surveillance T: +44 (0)1252 848315 F: +44 (0)1252 848301 M: +44 (0)7909 732264 Tony.Nancarrow@cobham.com Registered Number: 03118074 VAT Number: GB 719 0658 22 Registered Office: Brook Road, Wimborne, Dorset, BH21 2BJ, England Please consider the environment before printing this email. This e-mail and any files transmitted with it ("E-mail") is intended solely= for the addressee(s) and may contain confidential and/or legally privilege= d information. If you are not the addressee(s), any disclosure, reproductio= n, copying, distribution or other use of the E-mail is prohibited. If you h= ave received this E-mail in error, please delete it and notify the sender i= mmediately via our switchboard or return e-mail. Neither the company nor any subsidiary or affiliate or associated company n= or any individual sending this E-mail accepts any liability in respect of t= he content (including errors and omissions) nor shall this e-mail be deemed= to enter the company or any subsidiary or affiliate or associated company = into a contract or to create any legally binding obligations unless express= ly agreed to in writing under separate cover and timeliness of the E-mail w= hich arise as a result of transmission. If verification is required, please= request a hard copy version from the sender. This E-mail and any files transmitted with it ("E-mail") is intended sole= ly for the addressee(s) and may contain confidential and/or legally privi= leged information. If you are not the addressee(s), any disclosure, repro= duction, copying, distribution or other use of the E-mail is prohibited. = If you have received this E-mail in error, please delete it and notify th= e sender immediately via our switchboard or return e-mail. = Neither the company nor any subsidiary or affiliate or associated company= nor any individual sending this E-mail accepts any liability in respect = of the content (including errors and omissions) nor shall this e-mail be = deemed to enter the company or any subsidiary or affiliate or associated = company into a contract or to create any legally binding obligations unle= ss expressly agreed to in writing under separate cover and timeliness of = the E-mail which arise as a result of transmission. If verification is re= quired, please request a hard copy version from the sender. =0D --_000_B4D8B652D9DBC3439BF0E9497284E3A2067DBFE079NHC0PURCMS001_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

I was merging re= visions in a branch back to the trunk (which also had local revisions). (To= rtoise SVN merge type =3D “Merge a range of revisions”).

I had 2 conflicting files which I manually mer= ged (using Araxis Merge) to resolve the conflicts (and marked them as ̶= 0;resolved”).

The error occurred a= t the end of the merge process.

&nb= sp;

The whole merge process appears to= have been successful with new files having been added and conflicts resolv= ed.

 

Using Tortoise SVN 1.7.4, Subversion client 1.7.2, Subversion server = 1.6.11.

 

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

Su= bversion Exception!

--------------------= -------

Subversion encountered a serious= problem.

Please take the time to report= this on the Subversion mailing list

wit= h as much information as possible about what

you were trying to do.

But please f= irst search the mailing list archives for the error message

<= p class=3DMsoNormal>to avoid reporting the same problem repeatedly.

You can find the mailing list archives at<= /o:p>

http://subversion.apache.org/mailing-lists.ht= ml

 

Subversion reported the following

(= you can copy the content of this dialog

= to the clipboard using Ctrl-C):

&nb= sp;

In file

'D:\Development\SVN\Releases\TortoiseSVN-1.7.4\ext\subversion\subversion= \libsvn_wc\wc_db.c'

line 4131: assertio= n failed (presence =3D=3D svn_wc__db_status_normal)

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

OK  

-----------------------= ----

 

Regards,

 

Tony Nancarrow

&n= bsp;

Tony Nancarrow

Senior Software Engineer

Cobham Tactical Communications and Surveillance
T: +44 (0)1252 848315

=

F: +44 (0)1252 848301

M: +44= (0)7909 732264

<= span style=3D'font-size:10.0pt;font-family:"Tahoma","sans-serif";color:blac= k'>Tony.Nancarrow@cobham.com

 

<= span style=3D'font-size:8.0pt;font-family:"Tahoma","sans-serif"'>Registered= Number: 03118074   VAT Number: GB 719 0658 22<= /p>

Registered Office: Brook Road, = Wimborne, Dorset, BH21 2BJ, England

&= nbsp;

Please consider the enviro= nment before printing this email.

 

This e-mail and any = files transmitted with it ("E-mail") is intended solely for the a= ddressee(s) and may contain confidential and/or legally privileged informat= ion. If you are not the addressee(s), any disclosure, reproduction, copying= , distribution or other use of the E-mail is prohibited. If you have receiv= ed this E-mail in error, please delete it and notify the sender immediately= via our switchboard or return e-mail.

Neither the company nor any s= ubsidiary or affiliate or associated company nor any individual sending thi= s E-mail accepts any liability in respect of the content (including errors = and omissions) nor shall this e-mail be deemed to enter the company or any = subsidiary or affiliate or associated company into a contract or to create = any legally binding obligations unless expressly agreed to in writing under= separate cover and timeliness of the E-mail which arise as a result of tra= nsmission. If verification is required, please request a hard copy version = from the sender.

 

&nbs= p;

= 
This E-mail and any files transmitted with it ("E-mail") is intended=
 solely for the addressee(s) and may contain confidential and/or legally =
privileged information. If you are not the addressee(s), any disclosure, =
reproduction, copying, distribution or other use of the E-mail is prohibi=
ted. If you have received this E-mail in error, please delete it and noti=
fy the sender immediately via our switchboard or return e-mail.
 =

Neither the company nor any subsidiary or affiliate or associated company=
 nor any individual sending this E-mail accepts any liability in respect =
of the content (including errors and omissions) nor shall this e-mail be =
deemed to enter the company or any subsidiary or affiliate or associated =
company into a contract or to create any legally binding obligations unle=
ss expressly agreed to in writing under separate cover and timeliness of =
the E-mail which arise as a result of transmission. If verification is re=
quired, please request a hard copy version from the sender.


=0D
--_000_B4D8B652D9DBC3439BF0E9497284E3A2067DBFE079NHC0PURCMS001_--