You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Romain Prevost <Ro...@gltrade.com> on 2005/06/28 13:57:47 UTC
This is possible with PERFORCE > is it with SVN (yet ;) ) ?
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 ;) )
--
Romain Prévost
DP CORP (internship)
GLTRADE Headquarters
48 Rue Notre Dame des Victoires
75002 Paris
Switch Board: +33 1 53 40 00 00
Direct Line: +33 1 53 40 00 88
Fax: +33 1 53 40 01 40
www.gltrade.com
This email communication is confidential and is intended solely for whom it is addressed. Copying, or re-using in any way by anyone else is unauthorised. Any views or opinions expressed are those of the author and do not necessarily represent those of GL TRADE or any of its affiliates.
If you have received this mail in error, please destroy the copy in your possession and notify abuse@gltrade.com
This email communication is confidential and is intended solely for whom it is addressed. Copying, or re-using in any way by anyone else is unauthorised. Any views or opinions expressed are those of the author and do not necessarily represent those of GL TRADE or any of its affiliates.
If you have received this mail in error, please destroy the copy in your possession and notify abuse@gltrade.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: This is possible with PERFORCE > is it with SVN (yet ;) ) ?
Posted by Ben Collins-Sussman <su...@collab.net>.
On Jun 28, 2005, at 8:57 AM, Romain Prevost wrote:
>
> This is possible with Perforce, and I don't know if it is
> with SVN (I mean easily).
Yes, it's called 'cherry picking', the arbitrary porting of a
changeset from one branch ot another. Subversion does it fine. We
do this all the time when working on subversion itself. A bug is
fixed on the main trunk, then the changeset is backported to the
current stable-release branch. It's very easy to do.
(CVS does this too, it's nothing earthshattering. I think it's a bit
easier to do in Subversion, of course, because Subverison actually
gives *names* to changesets, whereas CVS has to rely on incessant
tagging to isolate changesets.)
Chapter 4 in the svn book is all about branching and merging, check
it out.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: This is possible with PERFORCE > is it with SVN (yet ;) ) ?
Posted by Mark Phippard <Ma...@softlanding.com>.
"Romain Prevost" <Ro...@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