You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Kamesh Jayachandran <ka...@collab.net> on 2006/07/07 07:05:49 UTC
[PATCH]merge-tracking svn diff pretty output for svn:mergeinfo diffs
Hi All,
As proposed by Garrett at
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=117410
Find the attached patch.
This patch makes the svn diff output to be human friendly to read
something like the following,
<snip>
Property changes on: .
___________________________________________________________________
Name: svn:mergeinfo
Reverted /branches/b1:r157
Merged /branches/b1:r89-95
Merged /branches/b2:r159
Index: test4.c
===================================================================
--- test4.c (revision 158)
+++ test4.c (working copy)
@@ -1 +0,0 @@
-hellow.
</snip>
[[[
Patch by: Kamesh Jayachandran <ka...@collab.net>
Showing a diff of 'svn:mergeinfo' property like other property diffs
will be very difficult to understand especially when the wc target has
undergone large number of previous committed merges and many uncommitted
local merges.
* subversion/libsvn_client/diff.c
(display_mergeinfo_diff):
New function that shows a 'svn:mergeinfo' prop diff in a easily readable
form.
(display_prop_diffs): Calls display_mergeinfo_diff.
]]]
Re: [PATCH]merge-tracking svn diff pretty output for svn:mergeinfo diffs
Posted by Garrett Rooney <ro...@electricjellyfish.net>.
On 7/11/06, Garrett Rooney <ro...@electricjellyfish.net> wrote:
> I think the consensus is we need to do something like this, but just
> in case it isn't I'll post this updated version of the patch before I
> commit to give people a chance to object.
>
> This fixes a segfault when there is no original property value, and
> adds some horizontal whitespace to improve readability, otherwise no
> changes.
Talked to dlr about it, and he was in favor, so I just committed the
change. If people decide to go another way we can always revert it.
Thanks for the patch Kamesh.
-garrett
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH]merge-tracking svn diff pretty output for svn:mergeinfo diffs
Posted by Garrett Rooney <ro...@electricjellyfish.net>.
On 7/7/06, Kamesh Jayachandran <ka...@collab.net> wrote:
> [[[
> Patch by: Kamesh Jayachandran <ka...@collab.net>
>
> Showing a diff of 'svn:mergeinfo' property like other property diffs
> will be very difficult to understand especially when the wc target has
> undergone large number of previous committed merges and many uncommitted
> local merges.
> * subversion/libsvn_client/diff.c
> (display_mergeinfo_diff):
> New function that shows a 'svn:mergeinfo' prop diff in a easily readable
> form.
> (display_prop_diffs): Calls display_mergeinfo_diff.
> ]]]
I think the consensus is we need to do something like this, but just
in case it isn't I'll post this updated version of the patch before I
commit to give people a chance to object.
This fixes a segfault when there is no original property value, and
adds some horizontal whitespace to improve readability, otherwise no
changes.
-garrett
Re: [PATCH]merge-tracking svn diff pretty output for svn:mergeinfo
diffs
Posted by Kamesh Jayachandran <ka...@collab.net>.
>
> Did you see
> http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=117467?
> I'm -1 (FWIW ;) on this change.
>
> Regards,
> Madan.
Responded there.
Any +1?
With regards
Kamesh Jayachandran
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH]merge-tracking svn diff pretty output for svn:mergeinfo diffs
Posted by Madan U Sreenivasan <ma...@collab.net>.
On Fri, 07 Jul 2006 19:35:17 +0530, Garrett Rooney
<ro...@electricjellyfish.net> wrote:
> On 7/7/06, Madan U Sreenivasan <ma...@collab.net> wrote:
>> On Fri, 07 Jul 2006 12:35:49 +0530, Kamesh Jayachandran
>> <ka...@collab.net> wrote:
>>
>> > Hi All,
>> > As proposed by Garrett at
>> > http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=117410
>> > Find the attached patch.
>> > This patch makes the svn diff output to be human friendly to read
>> > something like the following,
>>
>> Did you see
>> http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=117467? I'm
>> -1 (FWIW ;) on this change.
>
> Another argument in favor of this change is that it actually does give
> you all the information, just in a more useful form for the user. I
> mean it's not like unified diff output includes all the data, just
> enough to make the diff apply, this particular kind of data doesn't
> actually need any context to apply the diff, so I don't see why we
> should be printing any.
Apologize for the delayed reply, was offline for the last two days.
Well, I have placed my points, and I beleive they have been received well.
Since I seem to be the only one objecting on this issue, (isn't this patch
getting committed because of my objection alone?), I take back my -1. Lets
say, I call it a -0 now! :) Thanks for the patch, Kamesh.
Regards,
Madan.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH]merge-tracking svn diff pretty output for svn:mergeinfo diffs
Posted by Garrett Rooney <ro...@electricjellyfish.net>.
On 7/7/06, Madan U Sreenivasan <ma...@collab.net> wrote:
> On Fri, 07 Jul 2006 12:35:49 +0530, Kamesh Jayachandran
> <ka...@collab.net> wrote:
>
> > Hi All,
> > As proposed by Garrett at
> > http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=117410
> > Find the attached patch.
> > This patch makes the svn diff output to be human friendly to read
> > something like the following,
>
> Did you see
> http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=117467? I'm
> -1 (FWIW ;) on this change.
Another argument in favor of this change is that it actually does give
you all the information, just in a more useful form for the user. I
mean it's not like unified diff output includes all the data, just
enough to make the diff apply, this particular kind of data doesn't
actually need any context to apply the diff, so I don't see why we
should be printing any.
-garrett
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH]merge-tracking svn diff pretty output for svn:mergeinfo diffs
Posted by Madan U Sreenivasan <ma...@collab.net>.
On Fri, 07 Jul 2006 12:35:49 +0530, Kamesh Jayachandran
<ka...@collab.net> wrote:
> Hi All,
> As proposed by Garrett at
> http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=117410
> Find the attached patch.
> This patch makes the svn diff output to be human friendly to read
> something like the following,
Did you see
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=117467? I'm
-1 (FWIW ;) on this change.
Regards,
Madan.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org