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

'log -g' and the removal of implicit mergeinfo

From: Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu>
Date: 2007-11-16 04:23:58 CET

Dan, Mike, Mark and I had a conference call this afternoon in which we
discussed how Mike's work on the mergeinfoless-copies branch could
affect 'log -g'. Among other things, the conclusion was that losing the
implicit mergeinfo on a copy would make eliminating redundant log
messages easier, because it wouldn't see the mergeinfo, and attempt to
trace to the source of the merge.

As I've had more time to ponder the scenario, I'm still not quite
convinced. The reason we have to worry about redundant log messages
isn't because the mergeinfo exists, but rather because we are tracing
multiple lines of history which share history, and which will eventually
converge on a shared ancestor. Both lines of history will then produce
redundant log messages.

The reason we were using the implicit mergeinfo was to help detect when
a branching copy, and thus avoid duplicating history. The heuristic was
basically a poor man's --stop-on-copy for branches. It wasn't perfect,
but worked good enough.

If we remove implicit mergeinfo, we can't use this method. Is there a
better way? Or, have we been solving the wrong problem all along? How
can we capture only the changes on the branch, and not trace back to the
original history?


A related mail from June is here:

Received on Fri Nov 16 04:24:11 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.