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

Re: Need ammo against those who say "lock everything"

From: Brad Appleton <brad_at_bradapp.net>
Date: 2004-04-03 02:50:27 CEST

> When you've made a change C in your workspace,
> you need to integrate it via an algorithm that
> looks something like the following:
> checkout tree
> make change C
> loop
> test it
> if tests pass, break loop
> fix
> end loop
> loop
> update from mainline
> test it
> if tests pass
> if there has not been a change
> checkin
> break loop
> fi
> fi
> end loop
> You can short-circuit some of these steps,
> but the above is pretty much what you want to do
> if you want to guarantee that only code that
> passes all tests is checked in.
> Unfortunately, the above process is
> NOT guaranteed to terminate.

For an article that still supports copy-modify-merge
but which also discusses several different locking
mechanisms for ensuring the above DOES terminate
(without resorting to file-locking) take a look
at "Codeline Locking and Merging: Continuous Update,
Two-Phased Commits" at:

Brad Appleton <brad@bradapp.net> www.bradapp.net
  Software CM Patterns (www.scmpatterns.com)
   Effective Teamwork, Practical Integration
"And miles to go before I sleep." -- Robert Frost
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Apr 3 02:51:13 2004

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.