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

Re: Check in to a branch

From: Ryan Schmidt <subversion-2007b_at_ryandesign.com>
Date: 2007-04-27 10:13:16 CEST

On Apr 25, 2007, at 17:48, ying lcs wrote:

> On 4/25/07, Ryan Schmidt wrote:
>
>> On Apr 25, 2007, at 14:49, ying lcs wrote:
>>
>> > After I did the switch command:
>> > svn checkout http://svn.example.com/repos/calc/branches/
>> stable-1.0 .
>> >
>> > Why it said 'Updated to revision 114.'
>> >
>> > When I create the branch 'stable-1.0' it is revision 112 and after
>> > that I add 2 more revisions to the trunk and I have no commit to
>> the
>> > branch.
>> >
>> > So my branch revision is 112 and the latest revision to the trunk
>> > is 114.
>> >
>> > But when I do 'switch' to the Branch, why it updates to 114?
>> should it
>> > be 112 instead?
>>
>> There is no problem. Everything is working correctly. Let me try to
>> explain.
>>
>> The first half of the statement "my branch revision is 112 and the
>> latest revision to the trunk is 114" is not entirely accurate in
>> Subversion terminology. The correct statement is "the last changed
>> revision in the branch is 112 and the last changed revision in the
>> trunk is 114".
>>
>> In Subversion, the revision number is of the repository as a whole,
>> not of individual paths in the repository. The act of creating the
>> stable-1.0 branch created revision 112 of the repository. The act of
>> committing twice to the trunk created revisions 113 and 114 of the
>> repository. At this point in time, 114 is the so-called "HEAD"
>> revision of the repository. Any time you check out any entity from
>> the trunk without specifying a revision number, you will get the HEAD
>> revision.
>>
>> But this is ok. The revision number doesn't really matter. What
>> matters is the last changed revision. You can use "svn info" to
>> verify that the last changed revision of your branch is indeed 112.
>> If you now commit some change in the branch, that will create
>> revision 115 of the repository.
>
> Thank you for you detailed explanation.
>
> But after I do 'svn swtich' and then I do a 'svn commit', i notice
> some of the files
> are check in to the trunk, while others are in the branch.
>
> Can you please tell me what can cause that? I expect all the changes
> go to branches (not mixed).
>
> branches/STABLE_BRANCH/blocks/ListProcessor.cpp (modified) (3 diffs)
>
> branches/STABLE_BRANCH/blocks/BlockRemover.cpp (modified) (1 diff)
>
> branches/STABLE_BRANCH/blocks/Constants.h (modified) (1 diff)
>
> branches/STABLE_BRANCH/blocks/Processor.h (modified) (1 diff)
>
> branches/STABLE_BRANCH/ResultListProcessor.cpp (modified) (3 diffs)
>
> trunk/mozilla/content/Context2D.cpp (modified) (1 diff)
>
> trunk/blocks/BlockGrouper.cpp (modified) (1 diff)

You're right. I would also expect every change to end up on the
branch, not the trunk.

Could it be that some parts of your working copy did not get
switched, and were instead still pointing to the trunk? The way to
determine if that is the case is to run "svn status". If anything
shows up with the status "S", that means it is Switched to a
different location than the root of the working copy.

-- 
To reply to the mailing list, please use your mailer's Reply To All  
function
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Apr 27 10:13:56 2007

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