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

Re: Feature idea: Hierarchal logs (views? subrevisions?)

From: Tim Moloney <moloney_at_mrsl.com>
Date: 2002-07-25 03:54:17 CEST

Please help me get my brain around this and dumb it down a few
more levels.

cmpilato@collab.net wrote:

> In Subversion-speak, this would be:
> svn copy -m 'make experimental branch' \
> http//.../trunk http://.../branches/experimental
> ... remember the revision number we just created here as REV ...

A cheap copy was made directly in the repository so at revision
REV, both .../trunk and .../branches/experimental point to the
same stuff.

> svn switch http://.../branches/experimental

This switches the base of the working copy from .../trunk to
.../branches/experimental and applies any differences (which
there aren't any).

> ... do various stuff, commit changes, etc:
> svn commit -m '* Did something'
> svn commit -m '* Did something else'
> ... decide to commit to the main view:

Commit changes into .../branches/experimental.

> svn switch http://.../trunk

This switches the base of the working copy back to .../trunk
and applies the differences between .../branches/experimental
and .../trunk to the working copy (if there are any differences).

> svn merge -r REV:HEAD http://.../branches/experimental

This is where I get lost. The above command is the same as

   svn merge http://.../branches/experimental@REV \
             http://.../branches/experimental@HEAD .

which means merge the diffs of the entire experimental branch
into the working copy. Why is this command necessary. Aren't
these changes already in the working copy?

> svn commit -m '* Merging in experimental changes'

Commit the combined trunk and experimental branches back to

I must have some misunderstanding of the merge command (and
perhaps switch also). I've reread the pertinent sections of
the new handbook but it doesn't seem to help.

Tim Moloney
ManTech Real-time Systems Laboratory
2015 Cattlemen Road                             \     /
Sarasota, FL  34232                     .________\(O)/________.
(941) 377-6775 x208                        '  '  O(.)O  '  '
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jul 25 03:55:51 2002

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

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