On Tue, 2024-02-13 at 16:50 -0700, Daniel Sands wrote:
> > Sorry for the late response, but I lack the time to dig deeper. It
> > should work as in the example (test) that Stanimir Stamenkov posted
> > earlier in this thread.
> >
> I don't fully follow that Derby example, but it does not look like
> the
> same thing.
>
> I built my own experiment which I'll try to reconstruct here:
>
> mkdir test
> mkdir test/foo
> mkdir test/foo/bar
> mkdir test/baz
> echo "a" > test/foo/bar/example.c
> svn import test svn+ssh://theserver/var/svn/playground/test
> rm -rf test
> svn co svn+ssh://theserver/var/svn/playground/test
> cd test
> svn cp . ^/playground/test2
> cd ..
> svn co svn+ssh://theserver/var/svn/playground/test2
> cd test
> echo "b" > foo/bar/example.c
> svn commit
> cd ../test2
> svn merge ^/playground/test .
>
>
Further investigation from debugging the svn client 1.14: In the above
test branch, the conflict resolution goes through the function
find_revision_for_suspected_deletion and returns the revision where it
happened. But in my problem branch, this function cannot find the
revision where the file was deleted. This makes no sense to me, as it
was in the previous checkin.
