Merge into empty trunk
From: Michael Klemm <michael.klemm_at_informatik.uni-erlangen.de>
Date: 2005-07-27 11:47:29 CEST
trying to merge a branch back into some empty trunk I ran into deep
Add the beginning we created a repository with standard layout (trunk,
Having a stable release I want to merge the changes into trunk that is
svn merge -r118:464 https://.../branches/bugfix
inside the trunk. This failed because branches/bugfix is not a copy of
I'm stuck with trunk/bugfix which is not correct so far!
Is there any trick to get the merges ported into trunk (besides copying
-- Computer Science Department 2, University of Erlangen-Nuremberg Martensstrasse 3, D-91058 Erlangen, Germany phone: ++49 (0)9131 85-28995, fax: ++49 (0)9131 85-28809 web: http://www2.informatik.uni-erlangen.de/~klemm
This is an archived mail posted to the Subversion Users mailing list.