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

Re: Presentation for Berlin 10-13 June - "The future of merging with Subversion"

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Thu, 27 May 2010 09:05:30 -0400

Julian Foad wrote:
> julianf is trying to prepare a presentation to business users of svn,
> with the title "The future of merging", for the svn conference in Berlin
> on 10-13 June.
> /me wonders what are the main issues, concerns and developments for svn
> merging.
> * "True Renames" - properly merging renames. This is the Big One.

Be very careful about the terminology you use around the topic of renames.
"True Renames" has for some time been used to refer to a fundamental storage
layer change whereby a rename doesn't create a new node revision of the
renamed thing, only new revs of the parent directory(s) with revision
entries lists. This is *not* a direction we as a developer community have
committed to taking (and is specifically one that I don't believe to be
necessary to get the functionality that customers want).

"Atomic Renames" is another term that gets tossed around, and speaks to
Subversion's enforcing the simultaneous commit of both "sides" of a rename

You're safer saying something buzzword-free, though, such as "properly
merging renames".

> Any other suggestions of what I should say?

"Switch to mercurial"? (I'm kidding!!)

C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Received on 2010-05-27 15:06:09 CEST

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