Re: To reintegrate or not to be ...

2008/11/18 David Glasser <glasser_at_davidglasser.net>:
> Yes, SVN's support for merging is stupid, and --reintegrate is little
> more than a band-aid. But given the model we're still trying to
> support for some reason, that's more or less how it has to be.

So the implication is that this model shouldn't be supported and a new
one worked on? Or is it possible to fix the current one?

I appreciate that I'm late in the game as 1.5 is the first version of
SVN that i've actually used and so have missed all prior discussion of
this (and trying to extract the information from the list archives is
hard) so I may be going over old ground however..

For example some other SCM systems that do this seem to record the
merges of individual files - the equivalent in SVN might be that when
you merge any files that have actually changed get a mergeinfo
property put on them rather than just the top level folder - then
future merges would consider the ancestry of each file which then
works for cherry picked and subtrees etc.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-19 05:14:47 CET