Subversion exception while merging

I was merging revisions in a branch back to the trunk (which also had local revisions). (Tortoise SVN merge type = "Merge a range of revisions").
I had 2 conflicting files which I manually merged (using Araxis Merge) to resolve 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 having 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\libsvn_wc\wc_db.c'
line 4131: assertion failed (presence == 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_at_cobham.com<mailto:Tony.Nancarrow_at_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 privileged information. If you are not the addressee(s), any disclosure, reproduction, 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 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 unless expressly agreed to in writing under separate cover and timeliness of the E-mail which 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 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 prohibited. If you have received 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 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 unless expressly agreed to in writing under separate cover and timeliness of the E-mail which arise as a result of transmission. If verification is required, please request a hard copy version from the sender.

Received on 2012-02-06 14:24:53 CET