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

branching and switch question

From: Fery <engard.ferenc_at_innomed.hu>
Date: 2004-08-25 16:46:49 CEST

Hi all!

There is a situation in my project, where I do not find the correct
solution.

I have a working copy, where there are modifications which I want to
save in a branch (without the modifications made in the repository since
my last update), but later I want to merge them with the trunk.

I thought that I create the branch from the BASE revision of my working
copy, switch to it, and then commit my modifications. The problem is,
when I switch to the newly created branch, I get some conflicts, despite
of that the switch should modify nothing in my working copy!

Of course, I can simply checkout the newly created branch in a new
directory, manually copy my modified files into it (and its
subdirectories), and the commit it, but I suspect that the former method
should work.

(Anyway, my first try was to make a branch directly from my working
copy, but that time I couldn't create a diff which contained the
difference between the new branch, and its origin.)

What am I doing wrong? Thanks:
Ferenc

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Aug 25 16:27:25 2004

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