[Zope-dev] Subversion merge tracking

Tres Seaver tseaver at palladion.com
Thu Nov 13 11:28:24 EST 2008


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Benji York wrote:
> I'd like for us to disallow pre-1.5 Subversion clients from making
> commits starting one year from now (or sooner if there is consensus).
> 
> The recent hardware problems for svn.zope.org had the positive outcome
> of precipitating an upgrade to Subversion 1.5 which has merge tracking.
> One of the requirements to use merge tracking is that no pre-1.5 client
> merge to the branch that you want to use with merge tracking.
> 
> That means that as of now, anyone can use merge tracking on their
> projects as long as all merges are done with a mergeinfo-capable (1.5+)
> client.
> 
> Until we ban commits from pre-1.5 clients (using a pre-commit hook),
> anyone who wants to use merge tracking will have to be careful with the
> clients they use (and watch out for rouge merges from other contributors
> which can be fixed-up after the fact).
> 
> The Subversion book includes information about merge tracking:
> http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html
> http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html
> 
> A description of the pre-1.5 client problem is at
> http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.pre1.5clients

+0, I guess:  I would be more comfortable if we could measure the
incidence of pre-1.5 client usage over time, and maybe even identify the
committers who are using them, so that we can sent out a targeted
warning message before breaking their checkouts.


Tres.
- --
===================================================================
Tres Seaver          +1 540-429-0999          tseaver at palladion.com
Palladion Software   "Excellence by Design"    http://palladion.com
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFJHFWo+gerLs4ltQ4RAlDWAJ4mhFz6683K5eLs3T061ejSCaiIQACghWmn
OQjtYqIrO3TXnn5SsrjhrL4=
=Bncy
-----END PGP SIGNATURE-----



More information about the Zope-Dev mailing list