Ryan,
The reason I made this remark to prev. mail was also to get a review
of my assumption. So thanks for that :)
I guess your right concerning the way Subversion works, so locking the
branch to avoid 'losing' information is not necessary.
There is a practical issue though. People here do this kind of merges
during normal working hours. At the same time, some 30 people are
working
and committing on the repository.
If a merge takes 10 minutes to commit, it's not that uncommon for some-
body else to commit his/her changes during that time. The one with the
large commit 'loses' in that case, making him the one to start all over
( update takes 10 minutes too ). To avoid this type of waste of time,
we just lock that branch before merge.
I don't see a way to improve this situation, but any suggestions are
most
welcome.
Lieven.
> -----Original Message-----
> From: Ryan Schmidt [mailto:subversion-2005@ryandesign.com]
> Sent: woensdag 31 augustus 2005 13:58
> To: GOVAERTS Lieven
> Cc: users@subversion.tigris.org
> Subject: Re: Moving branch changes back to trunk
>
> > 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 ).
>
> That would be ridiculous if it worked that way.
>
> Subversion is designed so that you cannot lose information.
>
> If someone else commits to trunk before you commit your merge
> as above, then either 1) your commit happens, because their
> changes are in files you haven't touched; or 2) your commit
> is prevented from happening and you are informed that you
> must update your working copy first.
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 14:12:44 2005