You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by "Peter N. Lundblad" <pe...@famlundblad.se> on 2005/06/23 06:11:15 UTC
Re: svn commit: r15146 - trunk/notes
On Wed, 22 Jun 2005 kfogel@tigris.org wrote:
> + then 'svn blame' should show the changed lines in B as last
> + touched by A, even if the merge was committed by you and you are
> + not A. (Hmm, this gets tough to implement when one merges a range
> + of revisions simultaneously!)
> +
What if I do some tweaking between merge and commit (such as resolving a
conflict or something)?
Regards,
//Peter
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r15146 - trunk/notes
Posted by "Peter N. Lundblad" <pe...@famlundblad.se>.
On Thu, 23 Jun 2005 kfogel@collab.net wrote:
> "Peter N. Lundblad" <pe...@famlundblad.se> writes:
> > On Wed, 22 Jun 2005 kfogel@tigris.org wrote:
> >
> > > + then 'svn blame' should show the changed lines in B as last
> > > + touched by A, even if the merge was committed by you and you are
> > > + not A. (Hmm, this gets tough to implement when one merges a range
> > > + of revisions simultaneously!)
> > > +
> >
> > What if I do some tweaking between merge and commit (such as resolving a
> > conflict or something)?
>
> Well, I would think the revision should still be considered merged --
> you just did what was necessary to merge it. This is one reason the
> merge list (i.e., list of changes merged in) should be human-editable,
> probably.
>
I'm talking specifically about blame. I think the lines should be
considered to come from the revision in which they were merged. My
conflict resolution might not be the correct resolution, so you need to
know in which revision that change was made to be able to analyze it.
> Not that I've thought about implementation very deeply. That file is
> just a place for us to collect thoughts on the problem.
>
Yeah.
Regards,
//Peter
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r15146 - trunk/notes
Posted by kf...@collab.net.
"Peter N. Lundblad" <pe...@famlundblad.se> writes:
> On Wed, 22 Jun 2005 kfogel@tigris.org wrote:
>
> > + then 'svn blame' should show the changed lines in B as last
> > + touched by A, even if the merge was committed by you and you are
> > + not A. (Hmm, this gets tough to implement when one merges a range
> > + of revisions simultaneously!)
> > +
>
> What if I do some tweaking between merge and commit (such as resolving a
> conflict or something)?
Well, I would think the revision should still be considered merged --
you just did what was necessary to merge it. This is one reason the
merge list (i.e., list of changes merged in) should be human-editable,
probably.
Not that I've thought about implementation very deeply. That file is
just a place for us to collect thoughts on the problem.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org