So I've traced what happened to the path that causes a segfault, but I
can't reproduce it with a simple example.
I created develop branch, then a test branch from it.
On the test branch I added a file, and merged the toplevel of the test
branch back into devel
I made a release branch from devel. On devel, I deleted the file
I cherrypick merged this deletion at the top level of release
I merged the toplevel of release back into devel
On my work repo, this causes the crash. In a small repo where I have
repeated these steps, it does not.
On my work repo, svn can't figure out that the deletions on each side
are the same, even though I've outlined the steps here. On my simple
repo, the deletion is not performed, or else recognized to be related
changes somehow. When I try to use the --ignore-ancestry merge on my
test repo, I get the tree conflict but the resolution doesn't cause the
crash. I'm not sure what else I can do at this point. I'd love to know
why svn can't detect that these deletions are the same in my work
repo... This kind of problem plagues us
On 8/9/21 16:10, Stefan Sperling wrote:
On Mon, Aug 09, 2021 at 02:09:40PM -0400, Joshua Kordani wrote:
The shell script is easy. I run resolve on my codebase :-). The trick will
be recreating the repo history that reproduces this problem, and that has
always been gnarly to me. I could use some advice for this.
Basically, what I will try to do is create a folder with files. create a
branch at this point, move a file in the branch, cherry pick this commit
with the move into trunk, and then try a top level merge of the branch into
trunk. Those are the things I did to the repo, I'm not sure if others
mucked with it. If that doesn't work, I'll have to sleuth my repo and I'll
need help to do that
svn log -v can help you figure out what copies and deletions have
occurred. I suspect you have a case where some parent directory of the
affected file has also been deleted or replaced somewhere along the line.
Otherwise we should not get a NULL result when looking for the deleted
node in the parent directory's history.
--
Joshua Kordani
Senior Engineer
Robotic Research, LLC
jkord...@roboticresearch.com
CONFIDENTIALITY NOTICE: This communication may contain private, confidential
and privileged material for the sole use of the intended recipient. If you are
not the intended recipient, please delete this e-mail and any attachments
permanently.
