subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Bob Sandiford <bob.sandif...@sirsidynix.com>
Subject SVN crash on merge
Date Tue, 20 Jul 2010 14:08:26 GMT
Hi,

I was doing some 'svn merge' commands, and got this:

This application has halted due to an unexpected error.
A crash report and minidump file were saved to disk, you can find them here:
c:\tmp\svn-crash-log20100720095803.log
c:\tmp\svn-crash-log20100720095803.dmp
Please send the log file to users@subversion.apache.org to help us analyse
and solve this problem.

NOTE: The crash report and minidump files can contain some sensitive information
(filenames, partial file content, usernames and passwords etc.)

Basically, what I was doing was, after a  SVN server upgrade from svn 1.4.x to 1.6.12, and
using a corresponding 1.6.12 svn client, I was replacing old 'svnmerge' based tracking info
with new 'svn merge' tracking info.

Here's the whole output from my session:

C:\development\pristine ICE-4.0-merge branches\marc>svn pl . -v
Properties on '.':
  svn:ignore
    build
    dist

  reviewboard:url
    http://ironman/reviews
  svnmerge-integrated
    /marc/trunk:1-14938

C:\development\pristine ICE-4.0-merge branches\marc>svn pd svnmerge-integrated
property 'svnmerge-integrated' deleted from '.'.

C:\development\pristine ICE-4.0-merge branches\marc>svn info
Path: .
URL: svn://vcrep/UXP/marc/branches/ICE-4.0-merge
Repository Root: svn://vcrep/UXP
Repository UUID: 86b1f47f-8b1c-4ae9-be57-0dbcaf493a63
Revision: 15620
Node Kind: directory
Schedule: normal
Last Changed Author: bobs
Last Changed Rev: 15108
Last Changed Date: 2010-05-07 13:06:36 -0400 (Fri, 07 May 2010)


C:\development\pristine ICE-4.0-merge branches\marc>svn merge -r 1:14938 svn://vcrep/UXP/marc/trunk
--record-only

C:\development\pristine ICE-4.0-merge branches\marc>svn st
 M      .

C:\development\pristine ICE-4.0-merge branches\marc>svn pl . -v
Properties on '.':
  svn:ignore
    build
    dist

  reviewboard:url
    http://ironman/reviews
  svn:mergeinfo
    /marc/trunk:394-14938

C:\development\pristine ICE-4.0-merge branches\marc>svn mergeinfo svn://vcrep/UXP/marc/trunk
--show-revs eligible
r15787
r15850
r15871

C:\development\pristine ICE-4.0-merge branches\marc>svn merge svn://vcrep/UXP/marc/trunk
Conflict for property 'svnmerge-integrated' discovered on ''.
Select: (p) postpone,
        (mf) mine-full, (tf) theirs-full,
        (s) show all options: p
This application has halted due to an unexpected error.
A crash report and minidump file were saved to disk, you can find them here:
c:\tmp\svn-crash-log20100720095803.log
c:\tmp\svn-crash-log20100720095803.dmp
Please send the log file to users@subversion.apache.org to help us analyse
and solve this problem.

NOTE: The crash report and minidump files can contain some sensitive information
(filenames, partial file content, usernames and passwords etc.)

C:\development\pristine ICE-4.0-merge branches\marc>svn st
 M      .

i.e. svnmerge tracking info had previously been in place showing merged from trunk revs 1-14938.
 I deleted the 'svnmerge-integrated' property, and then ran a record-only merge against the
trunk from revisions 1-14938 to 'replicate' the old merge tracking info.

Then I checked on any pending merge revisions, found there were three, and tried to actually
do the merge from the trunk back into my feature branch, and boom.

log and dmp files are attached...

Here's the "svn -version" output:

C:\development\pristine ICE-4.0-merge branches\marc>svn --version
svn, version 1.6.12 (r955767)
   compiled Jun 21 2010, 16:00:59

Copyright (C) 2000-2009 CollabNet.
Subversion is open source software, see http://subversion.tigris.org/
This product includes software developed by CollabNet (http://www.Collab.Net/).

The following repository access (RA) modules are available:

* ra_neon : Module for accessing a repository via WebDAV protocol using Neon.
  - handles 'http' scheme
  - handles 'https' scheme
* ra_svn : Module for accessing a repository using the svn network protocol.
  - with Cyrus SASL authentication
  - handles 'svn' scheme
* ra_local : Module for accessing a repository on local disk.
  - handles 'file' scheme
* ra_serf : Module for accessing a repository via WebDAV protocol using serf.
  - handles 'http' scheme
  - handles 'https' scheme


Bob Sandiford | Lead Software Engineer | SirsiDynix
P: 519.883.6943 | Bob.Sandiford@sirsidynix.com
www.sirsidynix.com<http://www.sirsidynix.com/>


Mime
View raw message