Mailing-List: contact users-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Received-SPF: pass (nike.apache.org: domain of tinu44@gmail.com designates
 209.85.214.171 as permitted sender)
MIME-Version: 1.0
Date: Tue, 9 Oct 2012 17:23:30 +0200
Message-ID: 
 <CAAuEXngnBzvhfSpryv78y67s_Xpb3umeAzXobv6nF_zVtowj3g@mail.gmail.com>
Subject: How to merge a rename of a folder
From: Martin Bischoff <tinu44@gmail.com>
To: users@subversion.apache.org
Content-Type: multipart/alternative; boundary=e89a8fb1ebd4a5507f04cba1ebcd

--e89a8fb1ebd4a5507f04cba1ebcd
Content-Type: text/plain; charset=ISO-8859-1

I have a project which is being developed on /trunk, and at the same time I
have a branch (/branches/1.x) for maintenance of version 1.x.

Now I'd like to rename a folder of the project, e.g. /trunk/a to /trunk/b.
The same folder should also be renamed on the maintenance branch, so that
future bugfixes (made inside /trunk/b) can be merged to the branch.

If I merge the revision (in which /trunk/a was renamed to /trunk/b) to the
branch, then it seems that files inside /branches/1.x/b will then be
identical copies of the files inside /trunk/b at the HEAD revision. This
means, that for example, any changes made directly on /branches/a/text.txt
are then lost.

Obviously I'm doing something wrong!

What is the correct procedure to merge a rename of a folder to a branch?

Should I rename the folder independently on both trunk and the branch? Will
I then still be able to merge changes from /trunk/b to /branches/1.x/b?

BTW: I'm using the current version of TortoiseSVN, so I can't give the
exact svn commands that were used.

Thanks a lot for any help.

-Martin

--e89a8fb1ebd4a5507f04cba1ebcd
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

I have a project which is being developed on /trunk, and at the same time I=
 have a branch (/branches/1.x) for maintenance of version 1.x.<br><br>Now I=
&#39;d like to rename a folder of the project, e.g. /trunk/a to /trunk/b. T=
he same folder should also be renamed on the maintenance branch, so that fu=
ture bugfixes (made inside /trunk/b) can be merged to the branch.<br>
<br>If I merge the revision (in which /trunk/a was renamed to /trunk/b) to =
the branch, then it seems that files inside /branches/1.x/b will then be id=
entical copies of the files inside /trunk/b at the HEAD revision. This mean=
s, that for example, any changes made directly on /branches/a/text.txt are =
then lost.<br>
<br>Obviously I&#39;m doing something wrong!<br><br>What is the correct pro=
cedure to merge a rename of a folder to a branch?<br><br>Should I rename th=
e folder independently on both trunk and the branch? Will I then still be a=
ble to merge changes from /trunk/b to /branches/1.x/b?<br>
<br>BTW: I&#39;m using the current version of TortoiseSVN, so I can&#39;t g=
ive the exact svn commands that were used.<br><br>Thanks a lot for any help=
.<br><br>-Martin<br>

--e89a8fb1ebd4a5507f04cba1ebcd--