[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 04:05:36 CEST

cmpilato@collab.net wrote:
> Tim Moloney <moloney@mrsl.com> writes:
>>> 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?
> if they exist as local mods, then yes they are. if, however, they
> were committed to the branch, then when switching back to the "trunk
> view" they will be removed again (since they don't exist on the trunk).

Doh! I was only thinking of adding the changes from the trunk.
It didn't even occur to me that the experimental changes would
be removed from the working copy.

> you were this || close! not bad, i'd say! :-)

A small, but vital, bit of understanding.

Thanks. =)

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 04:07:10 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.