Re: swapping trunk and branch

On Wednesday 27 April 2011, Ben Carbery wrote:
> I have added directories, and moved some files. Also I am using svn1.4
> (still the current Red Hat release) which I understand has a much limited
> version of merge than 1.5+

The first thing to do is to upgrade SVN. Even though this ancient RH release
still only supplies 1.4, you should be able to locate backports for newer
versions. Note that this could require a dump/load cycle to make full use of
the new features.

> I tried merging but got a lot of errors - if this is the right way to go
> about it though, I'll have another attempt.

If you created the branch and started reorganizing things there
(moving/renaming etc) and you intend to merge those changes to the trunk when
done, you will have a hard time the further the branch and trunk diverge from
each other.

Now, if you made a change that should be in trunk, too, but depends on first
moving files around, merging from branch to trunk will probably fail. What you
can do then is just record the merge (so it isn't shown as eligible later on)
and then manually merge the single files, either using "svn merge" or maybe
even redoing the changes manually.

Good luck!

Uli

-- 
ML: http://subversion.apache.org/docs/community-guide/mailing-lists.html
FAQ: http://subversion.apache.org/faq.html
Docs: http://svnbook.red-bean.com/
**************************************************************************************
Domino Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
Visit our website at http://www.dominolaser.com
**************************************************************************************
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Domino Laser GmbH ist für diese Folgen nicht verantwortlich.
**************************************************************************************