Re: TortoiseSVN crashes on automatic merge (Problem 24254: libsvn_tsvn!svn_client_merge_peg5)

On 03.06.2013 16:19, Pavel Lyalyakin wrote:
> Hello,
>
> Nightly TortoiseSVN 1.7.99.24235 - 1.7.99.24246 crashes on invalid
> automatic merge operation. SVN.exe does not crash on the same operation,
> it outputs an error.
>
> * Environment:
>
> TortoiseSVN 1.7.99, Build 24246 - 64 Bit,
> Windows 7 64bit.
>
> * Reproduction script:
> (I'm also attaching archived testing repository for your convenience).
>
> 1. `svnadmin create testrepo`
> 2. `svn mkdir "file:///<insert-path>/testrepo/branches"
> "file:///<insert-path>/testrepo/trunk" -m "Added branches and trunk
> folders"`
> 3. `echo HELLOWORLD > text.txt`
> 4. `svn import text.txt file:///<insert-path>/testrepo/trunk/text.txt -m
> "Added a text file to trunk"`
> 5. `svn cp "file:///<insert-path>/testrepo/trunk"
> "file:///<insert-path>/testrepo/branches/1.0" -m "Branched /trunk
> to/branches/1.0"`
>
>
> 6. Checkout a working copy of the repository with TortoiseSVN,
> 7. Right click on "/trunk" in the working copy, go to TortoiseSVN |
> Merge | Automatic merge and attempt to merge with "/branches".
> NOTE: Merge "/trunk" with "/branches"! Not with "/branches/1.0".
>
> TortoiseSVN crashes at this step. Here is the crash report:
> https://www.crash-server.com/Problem.aspx?ClientID=tsvn&ProblemID=24254
>
> [[
> libsvn_tsvn!svn_client_merge_peg5+0x946
> libsvn_tsvn!svn_client_merge_peg5+0xede
> libsvn_tsvn!svn_client_merge_peg5+0x126e
> libsvn_tsvn!svn_client_merge_peg5+0x199
> tortoiseproc!SVN::PegMerge+0x236
> tortoiseproc!CSVNProgressDlg::CmdMergeReintegrate+0x4c6
> tortoiseproc!CSVNProgressDlg::ProgressThread+0x292
> mfc110u!_AfxThreadEntry+0x100
> msvcr110!beginthreadex+0x107
> msvcr110!endthreadex+0x192
> kernel32!BaseThreadInitThunk+0x1a
> ntdll!RtlUserThreadStart+0x1d
> ]]
>
> For the same automatic merge operation I get the error in SVN.exe:
>
> [[
> svn: E205000: Try 'svn help merge' for more information
> svn: E205000: Source and target must be different but related branches
> svn: E205000: Source and target have no common ancestor:
> 'branches_at_working' and'.@unspecified'
> ]]
>

Thanks for the detailed report. Unfortunately I have no idea on how to
fix this since the CL client does not crash only because it can use
internal svn functions. TSVN can not use those internal functions but
has to use the exported functions only.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3057035
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].