Re: svn commit: r15146 - trunk/notes

"Peter N. Lundblad" <peter@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
Received on Thu Jun 23 17:52:54 2005