You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by David Glasser <gl...@davidglasser.net> on 2007/08/18 16:01:16 UTC
Re: svn commit: r26148 - trunk/www/merge-tracking
On 8/17/07, hwright@tigris.org <hw...@tigris.org> wrote:
> Author: hwright
> Date: Fri Aug 17 18:14:48 2007
> New Revision: 26148
>
> Log:
> * www/merged-tracking/func-spec.html
> (auditing-scope): Update the section about 'svn blame -g' to include some more
> explanation and examples.
Hyrum, thanks for posting these examples! I hadn't really understood
how 'svn blame -g' would look before. I have one small suggestion:
> + <p>The output of <code>svn blame</code> may be the following:</p>
> + <pre>
> + 2 alice This is the file 'iota'.
> + 14 bob 'A' has changed a bit, with 'upsilon', and 'xi'.
> + </pre>
> +
> + <p>Using the <code>-g</code> switch will show the author who most recently
> + changed the line, independent of which branch it was changed on (so long as
> + the changes have been merged). If Chuck made changes to the file in r11,
> + which was then merged in r14, the output of <code>svn blame -g</code> for the
> + same file may look like this:</p>
> + <pre>
> + 2 alice This is the file 'iota'.
> + 11 chuck 'A' has changed a bit, with 'upsilon', and 'xi'.
> + </pre>
I think it might be helpful to add a single-character column to the
"svn blame -g" output which indicates whether or not a given line's
revision is describing a direct commit or a merge. Does this seem
useful to anyone else?
--dave
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r26148 - trunk/www/merge-tracking
Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
David Glasser wrote:
> On 8/20/07, Hyrum K. Wright <hy...@mail.utexas.edu> wrote:
>> David Glasser wrote:
>>> I think it might be helpful to add a single-character column to the
>>> "svn blame -g" output which indicates whether or not a given line's
>>> revision is describing a direct commit or a merge. Does this seem
>>> useful to anyone else?
>> I think that would be valuable. What kind of mark would you suggest?
>> Maybe an 'M' in the first column of output?
>
> Hmm, how about 'G', for consistency with our status letters?
Sounds good. (I had a lapse as to what our merged status letter was.)
-Hyrum
Re: svn commit: r26148 - trunk/www/merge-tracking
Posted by David Glasser <gl...@davidglasser.net>.
On 8/20/07, Hyrum K. Wright <hy...@mail.utexas.edu> wrote:
> David Glasser wrote:
> > I think it might be helpful to add a single-character column to the
> > "svn blame -g" output which indicates whether or not a given line's
> > revision is describing a direct commit or a merge. Does this seem
> > useful to anyone else?
>
> I think that would be valuable. What kind of mark would you suggest?
> Maybe an 'M' in the first column of output?
Hmm, how about 'G', for consistency with our status letters?
--dave
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r26148 - trunk/www/merge-tracking
Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
David Glasser wrote:
> On 8/17/07, hwright@tigris.org <hw...@tigris.org> wrote:
>> Author: hwright
>> Date: Fri Aug 17 18:14:48 2007
>> New Revision: 26148
>>
>> Log:
>> * www/merged-tracking/func-spec.html
>> (auditing-scope): Update the section about 'svn blame -g' to include some more
>> explanation and examples.
>
> Hyrum, thanks for posting these examples! I hadn't really understood
> how 'svn blame -g' would look before. I have one small suggestion:
>
>> + <p>The output of <code>svn blame</code> may be the following:</p>
>> + <pre>
>> + 2 alice This is the file 'iota'.
>> + 14 bob 'A' has changed a bit, with 'upsilon', and 'xi'.
>> + </pre>
>> +
>> + <p>Using the <code>-g</code> switch will show the author who most recently
>> + changed the line, independent of which branch it was changed on (so long as
>> + the changes have been merged). If Chuck made changes to the file in r11,
>> + which was then merged in r14, the output of <code>svn blame -g</code> for the
>> + same file may look like this:</p>
>> + <pre>
>> + 2 alice This is the file 'iota'.
>> + 11 chuck 'A' has changed a bit, with 'upsilon', and 'xi'.
>> + </pre>
>
> I think it might be helpful to add a single-character column to the
> "svn blame -g" output which indicates whether or not a given line's
> revision is describing a direct commit or a merge. Does this seem
> useful to anyone else?
I think that would be valuable. What kind of mark would you suggest?
Maybe an 'M' in the first column of output?
-Hyrum