Re: [TSVN] Re: stupid user (me!) - switch auto-updated repository - should it have?

Hi Simon! Thanks for the quick response.
In the meantime I'm now up-to-date with both Subversion and TortoiseSVN -
nothing like a problem to get me off my butt... :)

Thanks for clarifying that "switch" *is* what I wanted.

I've played with things a lot more now and figured out what I did. As usual,
the computer did just what it was told to do - it just wasn't what I *thought* I
was doing... Yup... stupid user... :)
But I still think it's incomplete - since it created the branch from the working
copy (committing my changes into the new branch) but *didn't* commit the new
files, so the branch won't compile.
Also, I think there's a minor bug in which revision number gets put into the log
when it creates the branch.

Since I was using 1.0.8 TSVN, I didn't have the "create branch/tag directly on
the server" checkbox - the branch was created from the working copy (trunk +
changes + added files)
This line from the help file says it:
        If you have uncommitted changes inside the
        working copy, TortoiseSVN will commit these
        together with creating the Tag

So it created the branch, and sent all the changes to the repository. (a bunch
of "sending content" lines and then the "you're still on the old branch"
warning.

Then when I switched the working copy to the branch, I got what I thought was
the "automatic commit" - but it's actually the merge back into the working copy
to make it match the branch. I was just confused that the initial creation was
the working copy's *modified* files rather than the "baseline" trunk files.
(ya, I get confused easily... :)

I did notice one oddity - when I do create the branch from the working copy
(i.e., the "directly on the server" checkbox is NOT checked) the "Add" line in
the log is off by one revision number - it shows:
        Add /foo/branches/blah (from /foo/trunk:327)
where it should show from 326. In this case 327 is from a completely different
project, so it can't be right.

There's also the question of what should happen with the added files when
initially creating the branch - shouldn't they be added into the branch also?
Although as I type this, I imagine that's a Subversion issue rather than TSVN...

Anyway, now that I understand what I did (and how to do what I wanted - check
the "directly on server" checkbox) I'm all set.

Thanks again!

- Al -

-- original message --

>Alan Jay Weiner wrote:
>> But I'm guessing that what I did is normal behavior (and still will
>> occur with latest) so I'm confused - seems like the repository was
>> changed ("committed") when I wasn't expecting it to - and **without
>> changing the revision number**. So I'm asking for clarification -
>> what did I do wrong?
>
>No, the repo is only changed when you commit (or do a copy/import
>directly in the repository), and changes to the repo _always_ increment
>the revision number.
>
>> What I did was made a copy of foo/trunk (HEAD) to
>> foo/branches/workonsomething
>>
>> No problem - created the branch fine:
>> foo/trunk is revision 326
>> foo/branches/workonsomething is revision 328
>> (327 is on another project, btw)
>>
>> I'd already made lots of changes in my working copy; they're buggy,
>> so I wanted to change so I'm working on a branch.
>> Working copy was originally same as foo/trunk (HEAD).
>>
>> So I right-clicked in my working copy and used TSVN's "Switch"
>> (my first mistake? should I have "relocated"?)
>
>No definitely not! Newer versions of TSVN will warn you of dire
>consequences if you relocate.
>
>> Got a dialog with a list of changes (update, conflict, etc - but
>> dismissed it too quickly so can't refer to it now). I *thought* it
>> was informational - what's different between the branch and my
>> working copy.
>
>It was informational - it was telling you that the branch you switched
>to was being merged into your WC _locally_, not in the repository.
>
>> Instead it appears to have automagically changed the branch to look
>> like my working copy - without a new revision number! The only
>> thing not in the repository is a couple of new files.
>> (I checked out a new copy of branch and diff'd - it's really changed)
>
>Changed compared to what? Checkout the trunk and compare the newly
>checked out trunk with the newly checked out branch. You should see no
>changes.
>
>What is in the repository is the unchanged branch. And if the branch was
>the same as trunk, then there should not have been any conflicts when
>you merged either, so essentially your WC content has not changed, but
>it should be different from the repository, so you should see lots of
>changed file overlays.
>
>> Now I'm confused -
>> should I have done a relocate instead of a switch?
>
>Nonono!!
>
>> I took relocate to mean switching the repository location;
>
>Correct.
>
>> does it work to switch the
>> working copy's "baseline" from one revision to another?
>
>No, you were right the first time. Use Switch to switch to a different
>branch/revision.
>
>> Why did the switch update the repository?
>
>Look again. I'm sure it didn't!
>
>Simon
>
>
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
>For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
>
>

-- 
--  Alan Weiner  --  alan_at_ajw.com  --  http://www.ajw.com
Palm OS Certified Developer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org