Hi,
> -----Original Message-----
> From: Ben Collins-Sussman [mailto:sussman@collab.net]
> Sent: woensdag 31 augustus 2005 4:44
> To: Andrew Boothman
> Cc: users@subversion.tigris.org
> Subject: Re: Moving branch changes back to trunk
>
>
> On Aug 30, 2005, at 7:12 PM, Andrew Boothman wrote:
> >
> > Or am I just making everything too complex and I should just do the
> > merge?
>
> You're thinking too hard. :-)
>
> If the trunk is exactly identical to the "beginning" state of
> the branch, then just compare HEAD of trunk with the HEAD of branch:
>
> $ svn checkout trunkURL project
> $ cd project
> $ svn merge trunkURL branchURL .
> $ svn commit -m "Merged branch changes to trunk."
This strategy is also explained in the SVN book, so we use it as well in
our projects.
There's only one problem. It is theoretically possible that someone else
is
committing to the trunk at the same time. If that commit makes it first
to
the repository, that changes will be lost ( in history ).
In our projects a typical commit can take as long as 10 minutes, so this
situation is not that uncommon. We therefore lock the trunk for all
users
except the one doing the merge ( with a custom locking mechanism ), and
release it again after the commit.
Lieven.
STRICTLY PERSONAL AND CONFIDENTIAL
This message may contain confidential and proprietary material for the sole use of the intended recipient. Any review or distribution by others is strictly prohibited. If you are not the intended recipient please contact the sender and delete all copies.
Dit bericht is enkel bestemd voor de aangeduide ontvangers en kan vertrouwelijke informatie bevatten. Als u niet de ontvanger bent, dan mag u de inhoud van dit bericht niet bekendmaken noch kopiëren. Als u dit bericht per vergissing ontvangen heeft, gelieve er de afzender of De Post onmiddellijk van op de hoogte te brengen en het bericht vervolgens te verwijderen.
Ce message est uniquement destiné aux destinataires indiqués et peut contenir des informations confidentielles. Si vous n'êtes pas le destinataire, vous ne devez pas révéler le contenu de ce message ou en prendre copie. Si vous avez reçu ce message par erreur, veuillez en informer l'expéditeur, ou La Poste immédiatement, avant de le supprimer.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Aug 31 08:39:22 2005