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

How to merge works done on various branches ?

From: <Gabriel.SCOLAN_at_messier-bugatti.com>
Date: Mon, 27 Apr 2009 11:41:11 +0200

Hi all,

I'm facing the following issue.
Suppose we have the following revisions graph:

1) While at revision 9, I detect for example that the modifications done
on revision 3 are not correct, and I'd like to remove them. Is there a
"quick" way to do this ? I've identified a way, selecting all the files
not modified on rev 4, 6 & 9, making a revert to rev 2, but it is a bit
painful to do it manually. For the files also touched by at least one of
the next revision, I redo manually also the operation.

2) While at revision 9, I detect that the modifications done on rev7 on
the branch (and only them, not the ones done on rev 5 and 8) are
interesting to be added on the trunk for the next software delivery for
example. Is there a "quick" way to do this ?

many thanks for the support !


"Ce courriel et les documents qui sont attachés peuvent contenir des
informations confidentielles. Si vous n'êtes pas le destinataire escompté,
merci d'en informer l'expéditeur immédiatement et de détruire ce courriel
ainsi que tous les documents attachés de votre système informatique. Toute
divulgation, distribution ou copie du présent courriel et des documents attachés
sans autorisation préalable de son émetteur est interdite."

"This e-mail and any attached documents may contain confidential or proprietary
information. If you are not the intended recipient, please advise the sender immediately
and delete this e-mai land all attached documents from your computer system. Any
unauthorised disclosure, distribution or copying hereof is prohibited."


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].

Received on 2009-04-27 11:42:10 CEST

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