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

RE: [PROPOSAL] Merging Improved

From: Sander Striker <striker_at_apache.org>
Date: 2003-04-11 00:09:57 CEST

> From: Tom Lord [mailto:lord@emf.net]
> Sent: Friday, April 11, 2003 12:06 AM

> On the subject of "faster, cheaper, better":
>
> Sander:
>
> > For the sake of this discussion I'm ignoring cherry picking
> > for now.
>
> > [...]
>
> > The goal of this proposal is to come up with a scheme that will
> > make the:
>
> > svn merge URL .
>
> > [...]
>
> > For sake of simplicity I'm leaving the handling of tree
> > deltas out of this proposal.
>
> > [...]
>
> > Merging will rely heavily on variance adjusting.

I just love quoting out of context...

Seriously, I meant to keep the proposal simple. For cherry picking
there is clearly a solution. The means to record the data for it
is already in the proposal. The same goes for out of tree, or unrelated
tree merging (although I need to work that out I do have something
on my desk for that).

Not doing tree deltas in the proposal is simply because the same
rules apply for them as for normal text files. The merge history
can be recorded in the svn:merged-from property on the directories
the same way as we do for files. Consider a directory to be a
textfile containing filenames ;). [in practice we have real code
to deal with tree deltas, but the idea is pretty much the same]

Sander

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Apr 11 00:10:40 2003

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