> -----Original Message-----
> From: Ryan Schmidt [mailto:subversion-2006Q1@ryandesign.com]
> Sent: Thursday, January 26, 2006 3:24 PM
> To: Ganssauge, Gottfried
> Cc: Subversion List
> Subject: Re: How to update a single file to HEAD revision?
>
> Don't forgot to reply to the list so everyone can benefit
> from the discussion.
Sorry.
...
> > So something like
> > How do I upgrade a file in a branch to the latest trunk release?
> > Don't use "svn upgrade", use "svn switch" ...
> > could make it into the FAQs.
>
> Define "upgrade".
cvs update!
>
> If you're in a working copy of the branch, and you use "svn switch"
> to change a file to the trunk, the file in the branch
> directory in the repository has not been changed at all.
> You've merely constructed a working copy part of which still
> points to the branch and part of which now points to the
> trunk. If you change the switched file and commit, the
> trunk's file will be changed, not the branch.
That is the semantic of "cvs update" when you update to the head or a
branch revision, so this is what I wanted to achieve.
>
> If what you actually want is that the version that's in the
> branch receives changes that were made in the version that's
> in the trunk, then what you want is to merge those changes
> into the branch. Merging is described in the book:
>
> http://svnbook.red-bean.com/en/1.1/ch04s03.html
Merging is done with "cvs update" as well but you need another set of
flags.
>
> I do recommend reading the entire book. It certainly helped
> me understand things. (It was my introduction to version
> control systems; I hadn't used one before.) If reading books
> onscreen is not your thing, you can buy this and several
> other books in tree form too. And there are certainly
> localized books available.... I think this is the Germam one
> we have at work:
>
> http://www.galileocomputing.de/katalog/buecher/titel/gp/titelID-929
>
> I think (at least I hope) my coworkers found it helpful...
I've got a printed copy and read it cover to cover - about two years
ago!
And that's my point:
In a day to day situation you're more likely to goto an FAQ instead of
reading a whole book.
Supposedly there are a lot of people coming from CVS who may have read
everything about subversion but still don't see the light.
They will be happy to see this (and other questions) answered in an FAQ.
And of course you are right: you cannot answer this question as simple
as I have done it - it depends on the goal you have.
So probably the answer should be something like your two paragraphs
above.
Cheers,
Gottfried
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jan 26 16:01:07 2006