[jira] [Closed] (SVN-4744) SVN 1.10 aborts during merge: assertion failed (start_rev > end_rev)

     [ https://issues.apache.org/jira/browse/SVN-4744?page=3Dcom.atlassian.=
jira.plugin.system.issuetabpanels:all-tabpanel ]

Daniel Sahlberg closed SVN-4744.
--------------------------------

> SVN 1.10 aborts during merge: assertion failed (start_rev > end_rev)
> --------------------------------------------------------------------
>
>                 Key: SVN-4744
>                 URL: https://issues.apache.org/jira/browse/SVN-4744
>             Project: Subversion
>          Issue Type: Bug
>          Components: libsvn_client
>    Affects Versions: 1.10.0
>         Environment: $ svn --version
> svn, version 1.10.0 (r1827917)
> =C2=A0=C2=A0 compiled Apr 17 2018, 08:38:15 on x86_64-redhat-linux-gnu
> =C2=A0
> Fedora28 (up to date)
> Linux rolf-linux 4.16.7-300.fc28.x86_64 #1 SMP Wed May 2 20:09:13 UTC 201=
8 x86_64 x86_64 x86_64 GNU/Linux
>            Reporter: Rolf
>            Assignee: Stefan Sperling
>            Priority: Major
>             Fix For: 1.10.3
>
>         Attachments: issue-4744.sh, svnlog1.txt, svnlog2.txt
>
>
> I'm running a 2-URL merge, and svn is aborting when trying to resolve con=
flicts on a directory that's been added both locally and as part of the oth=
er branch being merged in.=C2=A0 I cannot reproduce this using simple setup=
s, I have not been able to isolate what exactly triggers this behaviour, bu=
t it is reproducable on my repository.
> Here's the exact command that I run:
> svn merge ^/trunk ^/branches/feature/sempv2_vpn_mon_7 .
> It produces many pages of add/modifies/deletes (the merge involve thousan=
ds of files), and then it starts interactive resolution of the conflicts.
> Summary of conflicts:
> =C2=A0=C2=A0 Text conflicts: 40
> =C2=A0=C2=A0 Tree conflicts: 64
> I start by choosing "mf" for the first 5 conflicts, and then when it get =
to the 6th conflict, it prints this:
> =C2=A0
> =C2=A0Merge conflicts in 'solcbr/common/commands/config/about/aboutComman=
ds.py' marked as resolved.
> =C2=A0Searching tree conflict details for 'solcbr/common/commands/config/=
about/user' in repository:
> =C2=A0svn: E235000: In file 'subversion/libsvn_client/conflicts.c' line 2=
257: assertion failed (start_rev > end_rev)
> =C2=A0Aborted (core dumped)
> =C2=A0=20
> =C2=A0For this path the "user" diroctory was added in both the "mon_7" br=
anch and in the local branch.
> =C2=A0
> =C2=A0
> Backtrace from coredumpctl
> =C2=A0
> =C2=A0$ coredumpctl dump -o core.core
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 PID: 1=
2115 (svn)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 UID: 1=
000 (rolf)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 GID: 1=
000 (rolf)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Signal: 6 (ABRT)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Timestamp: Thu 2018-06-07 10:15:53 EDT (2m=
in 43s ago)
> =C2=A0=C2=A0 Command Line: svn merge -v ^/trunk ^/branches/feature/sempv2=
_vpn_mon_7 .
> =C2=A0=C2=A0=C2=A0=C2=A0 Executable: /usr/bin/svn
> =C2=A0 Control Group: /user.slice/user-1000.slice/[email protected]/gnome=
-terminal-server.service
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Unit: user@1=
000.service
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 User Unit: gnome-terminal-server.service
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Slice: user-1000.s=
lice
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Owner UID: 1000 (rolf)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Boot ID: bb60a0b96550448fa5b28=
a1b529839c2
> =C2=A0=C2=A0=C2=A0=C2=A0 Machine ID: e2af878696fe4a589a249c535fc30788
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Hostname: rolf-linux
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Storage: /var/lib/systemd/core=
dump/core.svn.1000.bb60a0b96550448fa5b28a1b529839c2.12115.1528380953000000.=
lz4
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Message: Process 12115 (svn) o=
f user 1000 dumped core.
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0 =C2=A0
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 Stack trace of thread 12115:
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 #0=C2=A0 0x00007fe79bdaaf2b raise (libc.so.6)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 #1=C2=A0 0x00007fe79bd95561 abort (libc.so.6)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 #2=C2=A0 0x00007fe79d9f5212 svn_error_abort_on_mal=
function (libsvn_subr-1.so.0)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 #3=C2=A0 0x00007fe7a01041cf find_revision_for_susp=
ected_deletion (libsvn_client-1.so.0)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 #4=C2=A0 0x00007fe7a01072de conflict_tree_get_deta=
ils_incoming_add (libsvn_client-1.so.0)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 #5=C2=A0 0x00007fe7a01034f9 svn_client_conflict_tr=
ee_get_details (libsvn_client-1.so.0)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 #6=C2=A0 0x0000564e75aaa474 svn_cl__resolve_confli=
ct (svn)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 #7=C2=A0 0x0000564e75abb357 conflict_walker (svn)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 #8=C2=A0 0x00007fe7a010f312 conflict_status_walker=
 (libsvn_client-1.so.0)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 #9=C2=A0 0x00007fe79fe6c8a8 send_status_structure =
(libsvn_wc-1.so.0)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 #10 0x00007fe79fe6ded3 get_dir_status (libsvn_wc-1=
.so.0)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 #11 0x00007fe79fe6f291 svn_wc__internal_walk_statu=
s (libsvn_wc-1.so.0)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 #12 0x00007fe7a010f494 svn_client_conflict_walk (l=
ibsvn_client-1.so.0)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 #13 0x0000564e75abb63c svn_cl__walk_conflicts (svn=
)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 #14 0x0000564e75ab4a58 svn_cl__merge (svn)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 #15 0x0000564e75ac004e sub_main (svn)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 #16 0x0000564e75aa50e7 main (svn)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 #17 0x00007fe79bd9718b __libc_start_main (libc.so.=
6)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 #18 0x0000564e75aa516a _start (svn)
> =C2=A0
> =C2=A0
> I have a 39M core file. Should I attach a compressed version of it?



--
This message was sent by Atlassian Jira
(v8.20.10#820010)