« Return to Thread: Creating Branches

Re: Creating Branches

by Mark Phippard-3 :: Rate this Message:

| View in Thread

On 2/13/07, lightbulb432 <veerukrishnan@...> wrote:

Mark Phippard-3 wrote:
>
> On 2/13/07, lightbulb432 <veerukrishnan@...> wrote:
>>
>>
>> Thanks. Few questions below:
>>

>> 1) Is switching from one branch/version to another using the "Switch"
>> command semantically the same as removing every file in the local copy
>> and
>> bringing over the specified branch/version from the repository into the
>> working copy?
>>
>> (Or could it result in a weird configuration if, say, you have more files
>> in
>> your working copy than the repository...in which case it might only bring
>> existing repository files over, leaving files in your working copy that
>> weren't there in the branch/version you switched to?)
>
>
> Yes, except it is done intelligently based on the info it has.  However,
> if
> you have unversioned files in your workspace, it will not do anything with
> those files.  If switch wants to add one of these files, it will fail with
> an obstruction error.  As long it does not want to add a file with the
> same
> name as an unversioned file in your workspace, you will be OK.  This has
> been improved in Subversion 1.5. (not released yet).
>

Oh, right, I had this problem before where I had multiple unversioned files
scattered throughout my project, and wanted to make them versioned to create
a new branch. Is there a way for subclipse to go through the project and
report all versioned files and you can make them versioned in one go?

The commit dialog box is exactly what I'm talking about, but that only works
when you want to do a commit, and the changes don't apply unless you
actually commit (i.e. if you cancel out, they're still set as unversioned)

If you do not commit the files, then they are not versioned.  A file that is added, is only scheduled for addition on the next commit.  For the purposes of switch, this would still lead to an obstruction.

Maybe this has to do with my next question. In subclipse, can you create a
branch/tag WHILE committing or is the model that you commit first, note the
revision number, then at any time in the future you can come back and make a
branch/tag for that revision number? How could I do the former?

This blog post might answer your question:

http://markphip.blogspot.com/2007/01/shelves-in-subversion.html

--
Thanks

Mark Phippard
http://markphip.blogspot.com/

 « Return to Thread: Creating Branches