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

Re: Moving branch changes back to trunk

From: Ryan Schmidt <subversion-2005_at_ryandesign.com>
Date: 2005-08-31 13:57:30 CEST

On 31.08.2005, at 08:37, GOVAERTS Lieven wrote:

>> $ 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 ).

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

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Aug 31 13:59:44 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.