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

Re: Merge & blame

From: Mark <email2mark_at_gmail.com>
Date: 2004-07-03 14:18:29 CEST

On 02 Jul 2004 20:48:38 -0500, kfogel@collab.net <kfogel@collab.net> wrote:
> Mark <email2mark@gmail.com> writes:
> > Since merge tracking is not scheduled, maybe subversion can address
> > this "blame" situation. If a file version is a result of a merge,
> > maybe "blame" or "annotate" can somehow show that in the place of the
> > author in the output. Instead of "user123" changing line 43, maybe
> > something like "user123 merge r1456" changing line 43. That is not
> > ideal, but better that the merger erroneously getting full credit for
> > everyones changes on that file.
> Well, if we had that, we'd have merge tracking... :-)

Cool, I had thought that merge tracking simply allowed the multiple
merges from one branch to another w/o needing to use something like
tags, like in cvs, to mark the last merge point, because the tool
remembers for you. But if merge tracking also means being able to use
annotate or blame to locate the real person who changed a given line,
even across branches, that is great!

Mark                   (email2mark at
O'Brien                 gmail dot com)
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jul 3 14:20:09 2004

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

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