[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: Tom Lord <lord_at_emf.net>
Date: 2003-04-14 02:46:39 CEST

       Sander:

> We have to merge the svn:merged-from properties. This
> specific property is going to be specially handled by the svn
> merge code. The generic diff/merge code won't be touching
> it.

I understand that but it's still a (logical) diff/merge. You
shouldn't be just combining the properties from the merged-from point
-- you have to compare the merged-from properties on the two sides of
the changes, look at their differences, then use those differences to
modify merged-from on the target tree. Diff the properties on both
sides of the change -- merge that diff into the properties on the
target.

That's a nice convenient fall-out of merge-history-in-trees
vs. merge-history-in-properties. In merge-history-in-trees, the
generic tree-delta algorithm does the right thing with merge histories
automatically. So in merge-history-in-trees, it's a literal
diff/merge -- no additional code required.

-t

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Apr 14 02:36:34 2003

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