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

Re: swapping trunk and branch

From: Ben Carbery <ben.carbery_at_gmail.com>
Date: Wed, 27 Apr 2011 20:34:15 +1000

I should have mentioned a couple of things..
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+

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.

On Wed, Apr 27, 2011 at 8:14 PM, Prabhu Gnana Sundar <prabhugs_at_collab.net>wrote:

> On Wednesday 27 April 2011 03:27 PM, Ben Carbery wrote:
>> Hi,
>> I am fairly new to version control, and have made what is probably a
>> newbie mistake.
>> I created a branch and switched to it. Later I committed changes that
>> were meant for trunk, forgetting that I had switched to the branch. So
>> I want to undo this, without losing the changes..
>> What is the correct way to 'swap' the branch and the trunk. I am
>> confused about whether I should be using copy, merge or some other
>> technique.
>> cheers!
>> B
> you can merge the branch to the trunk...
> --Prabhu
Received on 2011-04-27 12:34:46 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.