I'm an svn administrator for my company and I end up doing a lot of merges.
Today, I ran into this failure (reproducable).
svn: warning: W000002: Can't create temporary file from template
'/opt/sbox/rcampbell/auto-merge/solcbr/dataplane/sw/assuredDelivery/messageSpool/defrag/svn-XXXXXX':
No such file or directory
svn: E155027: Failure occurred resolving one or more conflicts
This happens after I run two commands:
svn merge ^/trunk@184967 ^/trunk@185348 . --accept postpone
and then
svn resolve solcbr/dataplane/sw/assuredDelivery/messageSpool
and then it gives me output:
$ svn resolve solcbr/dataplane/sw/assuredDelivery/messageSpool
Searching tree conflict details for
'solcbr/dataplane/sw/assuredDelivery/messageSpool' in repository:
Checking r184967... done
Tree conflict on 'solcbr/dataplane/sw/assuredDelivery/messageSpool':
A new directory appeared during merge of
'^/trunk/solcbr/dataplane/sw/assuredDelivery/messageSpool:184968-185348'.
It was added by solbuild in r184967.
A directory which already occupies this path was found in the working copy.
Select: (p) Postpone, (r) Mark as resolved, (i) Ignore incoming addition,
(m) Merge the directories,
(R) Delete my directory and replace it with incoming directory,
(M) Replace and merge, (h) Help, (q) Quit resolution: m
C solcbr/dataplane/sw/assuredDelivery/messageSpool/Rules.mk
svn: warning: W000002: Can't create temporary file from template
'/opt/sbox/rcampbell/auto-merge/solcbr/dataplane/sw/assuredDelivery/messageSpool/defrag/svn-XXXXXX':
No such file or directory
svn: E155027: Failure occurred resolving one or more conflicts
$ svn --version
svn, version 1.14.1 (r1886195)
compiled Oct 1 2021, 11:42:52 on x86_64-unknown-linux-gnu
The directory
"/opt/sbox/rcampbell/auto-merge/solcbr/dataplane/sw/assuredDelivery/messageSpool/defrag"
does not exist because it is a subdirectory that was added in trunk but NOT
added in the working branch.
We have already managed to get this merge to complete by renaming the
directories so they don't collide, but this happens to us more than you might
imagine and it would be nice if someone could take a look at this. Am I doing
something wrong or is this a bug in subversion?
-Rolf
________________________________
Confidentiality notice
This e-mail message and any attachment hereto contain confidential information
which may be privileged and which is intended for the exclusive use of its
addressee(s). If you receive this message in error, please inform sender
immediately and destroy any copy thereof. Furthermore, any disclosure,
distribution or copying of this message and/or any attachment hereto without
the consent of the sender is strictly prohibited. Thank you.
