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

Re: merging and switching

From: John P Cavanaugh <cavanaug_at_soco.agilent.com>
Date: 2002-01-24 20:33:47 CET

On Wed, Jan 23, 2002 at 08:15:44PM -0500, Garrett Rooney wrote:
> On Wed, Jan 23, 2002 at 05:37:58PM -0600, Ben Collins-Sussman wrote:
> > So, what method to use? And, do we need to stay flexible and
> > accept 2 different urls?
>
> well, as i said on IRC earlier, i can't come up with a use case that
> would involve diffing two different branches and applying the results
> to a third. it seems like two of the three things involved would just
> be different revs of the same branch, and you'd be applying the
> difference between them to another branch. (apply the difference
> between rev 6 and 7 of branch foo to the trunk, since we fixed a bug
> in that commit that still exists in the truck...)

I havent been following this thread closely, but we might want to
resurrect the discussion on change sets (sometimes referred to as change
packages) as I believe they might just utilize a use-case as described
above.

-----------------------------------------------------------------------
    John Cavanaugh Agilent Technologies
    R&D Program Manager 1400 Fountaingrove Pkwy
    Wireless Network Solutions Santa Rosa, CA 95403-1799

    Email: cavanaug@soco.agilent.com Phone: 707-577-4780
                                                707-577-3948 (Fax)
-----------------------------------------------------------------------
         When schemes are laid in advance, it is surprising
        how often the circumstances fit in with them.
                                             -- William Osler
-----------------------------------------------------------------------

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:59 2006

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.