You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by Paul Lindner <pl...@hi5.com> on 2008/01/29 20:06:05 UTC

Re: Is there any easy way to get better diffs for the change emails?

On Tue, Jan 29, 2008 at 10:42:30AM -0800, Cassie wrote:
> No matter how hard I try I just can not read and efficiently process the
> text diffs that get sent in all of our change emails. I need my green and
> blue and red highlighting, and side by side file comparisons.
> 
> Does anyone know of a way to get better diffs for other people's changes? Is
> there some service we can set up and then have urls in each email point to
> that service? Or anything like that?

The diffs I see have the URL included.  For example:

 URL: http://svn.apache.org/viewvc?rev=616466&view=rev

Myself, I use the IntelliJ svn support to track changes.  It supports
all kinds of pretty diffs.

-- 
Paul Lindner
hi5 Architect
plindner@hi5.com

Re: Is there any easy way to get better diffs for the change emails?

Posted by Cassie <do...@google.com>.
Nah, I meant the SVN commit email diffs.
Sorry for my naivete, I just didn't see the diff type switching capability
at the bottom of those urls the change email links to.

Thanks for all the tips on patches too though!

- Cassie


On Tue, Jan 29, 2008 at 11:17 AM, Kevin Brown <et...@google.com> wrote:

> What Cassie is referring to is not SVN commit diffs, but rather patch
> diffs
> sent in by non-comitters.
>
> The best thing to do is probably to take the actual patch file and open it
> with tkdiff or some other tool that understands the format. When they
> don't
> send a file, you have to copy the text into a new file and then do this.
> It's a pain, but it's about the best you can hope for.
>
> ~Kevin
>
> On Jan 29, 2008 11:06 AM, Paul Lindner <pl...@hi5.com> wrote:
>
> > On Tue, Jan 29, 2008 at 10:42:30AM -0800, Cassie wrote:
> > > No matter how hard I try I just can not read and efficiently process
> the
> > > text diffs that get sent in all of our change emails. I need my green
> > and
> > > blue and red highlighting, and side by side file comparisons.
> > >
> > > Does anyone know of a way to get better diffs for other people's
> > changes? Is
> > > there some service we can set up and then have urls in each email
> point
> > to
> > > that service? Or anything like that?
> >
> > The diffs I see have the URL included.  For example:
> >
> >  URL: http://svn.apache.org/viewvc?rev=616466&view=rev
> >
> > Myself, I use the IntelliJ svn support to track changes.  It supports
> > all kinds of pretty diffs.
> >
> > --
> > Paul Lindner
> > hi5 Architect
> > plindner@hi5.com
> >
>

Re: Is there any easy way to get better diffs for the change emails?

Posted by "Brian W. Fitzpatrick" <fi...@google.com>.
On Jan 29, 2008 11:26 AM, Paul Lindner <pl...@hi5.com> wrote:
> Ah, my mistake.  Here's one way that I've been integrating external
> patches into my local tree:
>
> 1) Save patch to file.
> 2) Use the Apply Patch feature of IntelliJ 7.0.
>      Version Control -> Apply Patch
> 3) Click on Show Diff.  Behold the green and blue.

FWIW, I usually keep a spare Subversion working copy around for just
this sort of thing.

-Fitz

Re: Is there any easy way to get better diffs for the change emails?

Posted by Paul Lindner <pl...@hi5.com>.
Ah, my mistake.  Here's one way that I've been integrating external
patches into my local tree:

1) Save patch to file.
2) Use the Apply Patch feature of IntelliJ 7.0.
     Version Control -> Apply Patch
3) Click on Show Diff.  Behold the green and blue.

On Tue, Jan 29, 2008 at 11:17:56AM -0800, Kevin Brown wrote:
> What Cassie is referring to is not SVN commit diffs, but rather patch diffs
> sent in by non-comitters.
> 
> The best thing to do is probably to take the actual patch file and open it
> with tkdiff or some other tool that understands the format. When they don't
> send a file, you have to copy the text into a new file and then do this.
> It's a pain, but it's about the best you can hope for.
> 
> ~Kevin
> 
> On Jan 29, 2008 11:06 AM, Paul Lindner <pl...@hi5.com> wrote:
> 
> > On Tue, Jan 29, 2008 at 10:42:30AM -0800, Cassie wrote:
> > > No matter how hard I try I just can not read and efficiently process the
> > > text diffs that get sent in all of our change emails. I need my green
> > and
> > > blue and red highlighting, and side by side file comparisons.
> > >
> > > Does anyone know of a way to get better diffs for other people's
> > changes? Is
> > > there some service we can set up and then have urls in each email point
> > to
> > > that service? Or anything like that?
> >
> > The diffs I see have the URL included.  For example:
> >
> >  URL: http://svn.apache.org/viewvc?rev=616466&view=rev
> >
> > Myself, I use the IntelliJ svn support to track changes.  It supports
> > all kinds of pretty diffs.
> >
> >

-- 
Paul Lindner
hi5 Architect
plindner@hi5.com

Re: Is there any easy way to get better diffs for the change emails?

Posted by Kevin Brown <et...@google.com>.
What Cassie is referring to is not SVN commit diffs, but rather patch diffs
sent in by non-comitters.

The best thing to do is probably to take the actual patch file and open it
with tkdiff or some other tool that understands the format. When they don't
send a file, you have to copy the text into a new file and then do this.
It's a pain, but it's about the best you can hope for.

~Kevin

On Jan 29, 2008 11:06 AM, Paul Lindner <pl...@hi5.com> wrote:

> On Tue, Jan 29, 2008 at 10:42:30AM -0800, Cassie wrote:
> > No matter how hard I try I just can not read and efficiently process the
> > text diffs that get sent in all of our change emails. I need my green
> and
> > blue and red highlighting, and side by side file comparisons.
> >
> > Does anyone know of a way to get better diffs for other people's
> changes? Is
> > there some service we can set up and then have urls in each email point
> to
> > that service? Or anything like that?
>
> The diffs I see have the URL included.  For example:
>
>  URL: http://svn.apache.org/viewvc?rev=616466&view=rev
>
> Myself, I use the IntelliJ svn support to track changes.  It supports
> all kinds of pretty diffs.
>
> --
> Paul Lindner
> hi5 Architect
> plindner@hi5.com
>