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

Re: [Subclipse-dev] Revision graph status and plan

From: <Stefan.Fuhrmann_at_etas.com>
Date: Wed, 20 Aug 2008 01:42:49 +0200

"Alberto Gimeno" <gimenete_at_gmail.com> wrote on 08/19/2008 05:30:22 PM:

> I have read the emails that talk about how to improve the display of
> revision graph. I like those suggestions. But I think that I'm going
> to spend the last days of summer of code in adding merge support to
> the cache implementation.

I assume you plan to use the log -g output for that. While this will
give an o.k. approximation of the "change flow", be aware that it does
not handle a number of special (or not so special) cases:

* partial merges (not all paths of a given revision got merged)
* reverse merges ("unmerge")
* blocked revisions ("record only")
* merges between "unrelated" files / folders

Further, more general issues should be addressed as well:

* differentiate between manual change and merged change
* no difference between "add w/ history" and "add modified w/ history"
* log -g stream duplicates many revisions in case of heavy
  branching / merging / reintegration
* maybe (did not check): sub-tree merges may or may not show up
  as merges for parent or root folders

Those issues may be ignored in an initial implementation but my hope
is that SVN grows some API to get all that information efficiently.

Currently, I have a sketch ready for a "proper" merge representation,
but won't get around to document it before sometime in September.
If all works out as intended, SVN / TSVN may finally get excellent
merge support. But there's still a huge amount of work to be done *sigh*.

-- Stefan^2.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subclipse.tigris.org
For additional commands, e-mail: dev-help_at_subclipse.tigris.org
Received on 2008-08-20 01:43:09 CEST

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