2008-02-21 18:10:03 svn update on branch 2008R1
Cameron Barfield (UNITED STATES)
Message: 51458 I checked out the 2008R1 distro and kernel yesterday with no problems.
Today I tried to update the kernel, but it looks like svn pulled the trunk kernel instead of the branch:
cameron@camlinux:~/src/blackfin/svn/uClinux-dist.2008/linux-2.6.x$ svn update
U sound/soc/blackfin/bf5xx-sport.c
U sound/soc/blackfin/bf5xx-sport.h
U sound/soc/blackfin/bf5xx-pcm.c
Updated to revision 4324.
Current trunk version is 4324 but the current branch version is 4314. But, more changes than that were made in the trunk.
QuoteReplyEditDelete
2008-02-21 18:12:21 Re: svn update on branch 2008R1
Cameron Barfield (UNITED STATES)
Message: 51459 Alright, now I'm just confused. My svn entries:
dir
4324
svn://firewall-sources.blackfin.uclinux.org:80/svn/linux-kernel/branches/2008R1
svn://firewall-sources.blackfin.uclinux.org:80/svn/linux-kernel
2008-02-21T05:43:45.907607Z
4314
cliff
has-props
svn:special svn:externals svn:needs-lock
There's an entry for the branch and the trunk?
QuoteReplyEditDelete
2008-02-21 18:17:20 Re: svn update on branch 2008R1
Cameron Barfield (UNITED STATES)
Message: 51460 I think I just answered my own question, but I'm still confused.
QuoteReplyEditDelete
2008-02-21 18:32:18 Re: svn update on branch 2008R1
Mike Frysinger (UNITED STATES)
Message: 51461 dont look at the raw .svn/entries, that's a pain to parse. use the svn property commands.
if you are using uclinux-dist trunk, then you should see in the top dir:
$ svn pg svn:externals
linux-2.6.x svn://firewall-sources.blackfin.uclinux.org:80/svn/linux-kernel/trunk
if you are using the uclinux-dist 2008R1 branch, then you should see in the top dir:
$ svn pg svn:externals
linux-2.6.x svn://firewall-sources.blackfin.uclinux.org:80/svn/linux-kernel/branches/2008R1
if your properties do not look like that, then do `svn up -N` in the top level to make sure your properties are correct. or just manage the linux-2.6.x dir yourself by using `svn up --ignore-externals` when updating the uclinux-dist tree.
QuoteReplyEditDelete
2008-02-21 19:01:23 Re: svn update on branch 2008R1
Cameron Barfield (UNITED STATES)
Message: 51462 So everything is checking out okay (my output matches yours).
I think the main confusion stemmed from when I update the kernel and it reports a different revision that is in the branch svn log on your site.
QuoteReplyEditDelete
2008-02-21 19:30:08 Re: svn update on branch 2008R1
Mike Frysinger (UNITED STATES)
Message: 51463 there's two revision numbers ... that of the tree (which is what gets displayed) and that of the base directory (which is what actually matters)
run `svn info` to find the values of both ... so in the 2008R1 kernel branch, you would see something like:
$ svn info
Path: .
URL: svn://nwd2cvs1.corp.analog.com/svn/linux-kernel/branches/2008R1
Repository Root: svn://nwd2cvs1.corp.analog.com/svn/linux-kernel
Repository UUID: 526b6c2d-f592-4532-a319-5dd88ccb003d
Revision: 4324
Node Kind: directory
Schedule: normal
Last Changed Author: cliff
Last Changed Rev: 4314
Last Changed Date: 2008-02-21 00:43:45 -0500 (Thu, 21 Feb 2008)
this tells you that "4324" is the last revision of the tree that you've updated against, while the local directory (linux-kernel/branches/2008R1/) was last updated with rev "4314"
QuoteReplyEditDelete
2008-02-22 12:20:27 Re: svn update on branch 2008R1
Cameron Barfield (UNITED STATES)
Message: 51511 Ah, thanks. That makes more sense now.
I'd assumed that the "trunk" and "branches" were entirely separate.