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

RE: Branching: not getting it

From: Henderson, Michael D <michael.d.henderson_at_lmco.com>
Date: 2004-04-27 21:38:03 CEST

>From: Ben Collins-Sussman [mailto:sussman@collab.net]
> I think your plan is good in spirit, just a bit confused with the
> details. I imagine you haven't actually done any branching or merging
> with svn yet, just read about it. :-)

Yup. I'm reading the book trying to get the theory down before I start
mucking with the repository.

I'm weirded out because we would never be making changes to files on the
branches, just on the trunk. It's like the opposite of what the book

>> $ svn copy --revision {developer's rev}
> That's not how you copy changes from one branch to another. You need
> read about the 'svn merge' command. And the developer only needs to
> tell the tech team: "merge these revisions from trunk to branch."
> There's no need to list file paths, because each revision already
> represents a changeset, and thus a list of specific file paths.

Okay. I use the svn copy to create the initial branch, then svn merge
the delta files into the branch.

>> $ svn export svn://zinc/batch/branches/rc1.test/{developer's path}
>> batch/{developer's path} --force
>> Question: This seems like overkill to me, but I haven't been able to
>> export a single file. When I try, I get the following error (this is
>> in 1.0.2).
> Just 'svn cat URL' to get a single file. No need to 'svn export'.

 $ svn cat svn://zinc/scripts/config/stars.cfg >

That works. I can create a wrapper script to do the redirect properly.

>> Question: I think that the way that we're using branches is similar
>> how tags are described in the book, so would this make more sense to
>> create as tags/ instead of branches/?
> Nope, because tags are "frozen" snapshots. Branches are lines of
> development that change. So you're doing the right thing, using
> branches.

Okay. I can make the tag of the branch before deleting it. That'll be
permanent documentation. No, wait, I'd be better off making the tag
against the trunk since I'm deleting the branch.

I'll create a new repository tonight and actually try this out.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Apr 27 21:39:22 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.