Re: merging and switching

On Thu, Jan 24, 2002 at 01:54:11PM -0600, Jay Freeman (saurik) wrote:

> I branch the main line of Optasia away from the code that Jake and Tony are
> working on so I can get ATI Radeon 8500 support in without destroying what
> they are doing. I branch from an existing tag. I figure to do this I'm
> doing:
>
> svn cp http://svn.ninetjer.org/svn/optasia/tags/optasia-gdc_2001
> http://svn.ninetjer.org/svn/optasia/branches/optasia-radeon_8500
>
> (please god all mighty don't tell me I need to check out either repository
> to do this...)

don't worry, that can all be done from outside a working copy (that's
how the recent tag was laid down for 0.8, the one that sent us all 8
meg emails ;-) )

> OK, so now Jake is working on the next major milestone (the E3 game demo).
> Let's say he finishes that (dedicated worker he is), but I've been spending
> so much time fighting with our old CVS repository that I'm _still_ working
> on Radeon support. So, I want to do the following merge to get the new
> updates to my working copy:
>
> svn merge http://svn.ninetjer.org/svn/optasia/tags/optasia-gdc_2001
> http://svn.ninetjer.org/svn/optasia/tags/optasia-e3_2001

i can see why one would want to do this (easier to think it terms of
tags than revs), but if you know the revision that was tagged as
optasia-e3_2001, you could just do:

svn merge http://svn.ninetjer.org/svn/optasia/trunk -r 100:200

(assuming 100 is when you branched from trunk, and 200 is when
optasia-e3_2001 was tagged)

that would be the same thing, right?

perhaps we just need to provide an easy way to get that revision
number...

(part of my problem here is that i am used to thinking in revisions,
not in branches and tags, so perhaps we should be doing more for those
people out there who are used to branches and tags.)

-garrett

-- 
garrett rooney                     Unix was not designed to stop you from 
rooneg@electricjellyfish.net       doing stupid things, because that would  
http://electricjellyfish.net/      stop you from doing clever things.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org