[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

AW: Merge into empty trunk

From: Felix Gilcher <gilcher_at_exozet.com>
Date: 2005-07-27 12:00:36 CEST

Hi,

> -----Ursprüngliche Nachricht-----
> Von: Michael Klemm [mailto:michael.klemm@informatik.uni-erlangen.de]
> Gesendet: Mittwoch, 27. Juli 2005 11:47
> An: users@subversion.tigris.org
> Betreff: Merge into empty trunk
>
> Hi there,
>
> trying to merge a branch back into some empty trunk I ran into deep
> trouble. That's the situation:
>
> Add the beginning we created a repository with standard layout (trunk,
> branches, tags, releases). We then started development in a newly
> created sub-directory of branches (branches/student). After
> the student
> was finished, we branched off a new branch branches/bugfix from
> branches/student.
>
> Having a stable release I want to merge the changes into trunk that is
> now empty. I tried a
>
> svn merge -r118:464 https://.../branches/bugfix
>
> inside the trunk. This failed because branches/bugfix is not a copy of
> trunk. However, if I try to do a
>
> svn cp https://.../branches/bugfix https://.../trunk
>
> 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
> them manully using a Unix cp)?

As /trunk is empty anyways, delete trunk an then try:

svn cp https://.../branches/bugfix https://.../trunk

This should recreate /trunk as a copy of your bugfixing branch, keeping all history.

>
> Regards
> -michael
>
> --
> 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
>

regards

fg

--
Felix Gilcher
Head of IT Development
Exozet Berlin GmbH
Rotherstraße 20
10245 Berlin
eMail: gilcher@exozet.com
URL: www.exozet.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jul 27 12:02:37 2005

This is an archived mail posted to the Subversion Users mailing list.