On Sunday 21 March 2004 07.11, Ben Collins-Sussman wrote:
> On Sat, 2004-03-20 at 15:40, Alexander L. Belikoff wrote:
[...]
> > In this particular case, at least having an ability to
> > merge the changes from another branch using common ancestor as a starting
> > point would help.
Looking forward to that!
> Absolutely. This is a planned feature. The book explicitly discusses
> this fact, and explicitly discusses strategies for working around it.
>
> > Finally, there was also an issue of exaggerated expectations. For
> > example, a very large number of CVS users I had to deal with were
> > confident that Subversion would track merge operations.
>
> Where on earth did they get that idea? Subversion's global revnums
> certainly make it *easier* to perform CVS-style merges, but we've never
> had merge tracking or ever made such claims. I've never seen any
> document making those claims either. Can you ask your users where they
> got this idea? It would be useful to know.
I'm guessing here, but I hoped svn would track merges, too, when I first
started to look at it: it's supposed to solve the most annoying problems you
have when using CVS - reorganizing directories and having atomic commits fall
in this category, and having to figure out merges also falls in this
category.
>
> > I heard numerous times "Well, if
> > Subversion doesn't track merges, it is basically a CVS with a DB and
> > atomic commits."
>
> Right. Atomic commits. And versioning of directories. And copies and
> renames. And efficient compression of binary data. And order 1
> branching and tagging. And versioned metadata. I wouldn't exactly call
> that "just CVS with atomic commits." :-)
The one thing I hate about subversion is that it mixes the file system
namespace with the tags/branches namespace. I feel that these are two
completely different things, and have nothing to do with each other, so
subversion shouldn't mix them together either. (Granted, the solution in
subversion works and is efficient. It's just, imho, not elegant).
cheers
-- vbi
--
Every religion is about absolute belief in its own superiority and the
divine right to impose its version of truth upon others.
-- Pervez Amir Ali Hoodbhoy, Prospect Magazine Feb 2002
- application/pgp-signature attachment: signature
Received on Sun Mar 21 10:59:52 2004