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

Re: This is possible with PERFORCE > is it with SVN (yet ;) ) ?

From: Mark Phippard <MarkP_at_softlanding.com>
Date: 2005-06-28 16:11:02 CEST

"Romain Prevost" <Romain.Prevost@gltrade.com> wrote on 06/28/2005 09:57:47
AM:

> Here's a litte ascii schema
>
> --------------------------------- branch 2
> |
> |
> ------------------------------------------- branch 1
> - - -
> - - -
> a b c
>
>
> Let's say that a, b and c are three different revisions
> of my project on the main trunk.
>
> After a, the project forks, to create branch 2.
>
> Then, on branch 1, I make the revision B, which is a
> real nightmare, I break a lot of code, etc... etc...
> and soon after someone commits the revision C with bug
> fixes, and lot of improvements, but carries the problems
> introduced with B.
>
> Is it possible to merge the changes of revision C with
> branch 2, without merging the changes of revision B ?
>
> This is possible with Perforce, and I don't know if it is
> with SVN (I mean easily).
>
> If it's not possible with SVN, this will be the killer
> feature of Perforce over it. But if it is, (and you tell me),
> you can be pretty sure that 280 developers will soon turn to SVN.
>
> (plus it would look great in my internship report ;) )

Subversion handles that quite easily. I would almost say "trivially". The
fact that revision B was a big change that broke things is sort of
irrelevant. The main issue is that you want to apply the change in
revision C to the branch. This is essentially the way that Subversion
itself manages it's stable releases. A branch is made for the release,
and then individual fixes can be "back-ported" despite all of the new
release development that has been happening on trunk. Of course not all
revisions are going to back-port cleanly, but generally it works quite
well and quite easily.

Mark

_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jun 28 16:20:24 2005

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