[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: André Pönitz <andre_at_wasy.de>
Date: 2005-06-29 11:39:03 CEST

Romain Prevost:
> Sent: Tuesday, June 28, 2005 3:58 PM
> To: users@subversion.tigris.org
> Subject: 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 ?

Making a diff between revisions 'b' and 'a' and merge that
on top of 'c' should get you as close as possible to what
you want, shouldn't it?

Andre'

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jun 29 11:42:37 2005

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