Stefan Haller wrote:
> Hyrum K. Wright <hyrum_wright@mail.utexas.edu> wrote:
>
>> This idea of representing the merged revisions inline when using
>> '--merge-sensitive' is starting to grow on me. Should they be included
>> in all 'svn log' invocations, or just enabled by using '--verbose'?
>
> No, '--verbose' would be the wrong flag for this. '--merge-sensitive'
> should control whether the merged revisions show up at all; and if they
> do, '--verbose' should control whether the changed path information is
> shown for them, like for every log entry.
Upon thinking about it further, I agree.
>> I guess, without '--verbose' it may be difficult to determine that the
>> revision came in as a result of a merge.
>
> I'm strongly in favour of indenting the log entries for the merged
> sub-revisions (with a new level of indentation for every merged revision
> that was in turn a merge). This is particularly important with
> --merge-sensitive and --quiet, but without --verbose:
>
> ------------------------------------------------------------------------
> r23493 | malcolm | 2007-02-24 09:24:26 +0100 (Sat, 24 Feb 2007)
> ------------------------------------------------------------------------
> r23474 | dlr | 2007-02-23 00:04:33 +0100 (Fri, 23 Feb 2007)
> ----------------------------------------------------------------------
> r23406 | blair | 2007-02-16 03:30:50 +0100 (Fri, 16 Feb 2007)
> ----------------------------------------------------------------------
> r23405 | blair | 2007-02-16 03:29:38 +0100 (Fri, 16 Feb 2007)
> ------------------------------------------------------------------------
Ah, but if you don't use '--merge-sensitive', the merged revisions won't
show up *at all*. If you really wanted to know which revisions were
merge, and which were native, it would be possible to run 'svn log'
twice, once with '--merge-sensitive' and once without it. The new
revisions would be pretty obvious (especially if combined with your
favorite diff tool.)
Also, in the indentation scheme, how would '--limit' function? Just
limit the native revisions? Limit all revisions, including merged ones?
In the above example, it would seem incomplete to print one of the
indented revisions and not the other, if the user gave '--limit 3'.
-Hyrum
Received on Tue Mar 6 14:53:51 2007