Screenshots of GUI Merge tools (was Re: How uniform can GUI clients be?)

["B. W. Fitzpatrick" <fi...@red-bean.com>]

> 
> Brian Behlendorf <br...@collab.net> writes:
> 
> > > Ho hum. Is is time we started a screenshot repository for such things? 
> > > It's a bit hard to argue GUI design in text-only mail. (Of course, 
> > > screenshots are not the be-all of GUI design.)
> > 
> > +1, I'm very interested in this, having never used any graphical
> > branch/merge visualization tools myself (and feeling the pain from time to
> > time).
> 
> Okay, we already have a notes/ subdir at the top of our source tree,
> used for scratch work, ideas, etc.  I created a difftools/ subdir and
> a pics/ subdir within. 
> 
> So start dropping screenshots in there.  :)

You asked for it, you got it!

...subversion/notes/difftools/pics$ ls -1
CVS
FileMerge-README
FileMerge1.jpg
FileMerge2.jpg
FileMerge3.jpg
FileMerge4.jpg
FileMerge5.jpg
README
...subversion/notes/difftools/pics$

Feel free to send me any questions.

-Fitz

Re: Screenshots of GUI Merge tools (was Re: How uniform can GUI clients be?)

[Garance A Drosihn <dr...@rpi.edu>]

At 8:49 AM -0500 1/31/01, Alan Shutko wrote:
>"B. W. Fitzpatrick" <fi...@red-bean.com> writes:
>
>>  Feel free to send me any questions.
>
>Got one.  How does FileMerge show things where only a few
>words in a line changed?  Ediff will highlight those a
>different color so that you can see the lines which changed,
>as well as what changed in those lines.

Filemerge uses a grey background to show which lines have
changed, and blue characters to show which characters have
changed in those lines.  This works fairly well unless the
characters which have changed are blanks, tabs, or something
else which isn't going to be displayed.

(you can set which color to use for showing the changed
characters, but it defaults to blue.  You can also turn
that feature off if you want)
-- 
Garance Alistair Drosehn            =   gad@eclipse.acs.rpi.edu
Senior Systems Programmer           or  gad@freebsd.org
Rensselaer Polytechnic Institute    or  drosih@rpi.edu

Re: Screenshots of GUI Merge tools (was Re: How uniform can GUI clients be?)

[Alan Shutko <at...@acm.org>]

"B. W. Fitzpatrick" <fi...@red-bean.com> writes:

> Feel free to send me any questions.

Got one.  How does FileMerge show things where only a few words in a
line changed?  Ediff will highlight those a different color so that
you can see the lines which changed, as well as what changed in those
lines.

-- 
Alan Shutko <at...@acm.org> - In a variety of flavors!
Keep your boss's boss off your boss's back.

Re: Screenshots of GUI Merge tools (was Re: How uniform can GUI clients be?)

[Joerg Bullmann <jo...@fontworks.com>]

At 10:16 PM -0600 1/30/01, B. W. Fitzpatrick wrote:
>You asked for it, you got it!
>
>...subversion/notes/difftools/pics$ ls -1
>CVS
>FileMerge-README
>FileMerge1.jpg
>FileMerge2.jpg
>FileMerge3.jpg
>FileMerge4.jpg
>FileMerge5.jpg
>README
>...subversion/notes/difftools/pics$
>
>Feel free to send me any questions.
>
>-Fitz

How do we go about adding screen shots?
Want me to email them to you? I haven't
got commit access.

Cheers,
Joerg

Re: Screenshots of GUI Merge tools

[Bob Miller <kb...@jogger-egg.com>]

B. W. Fitzpatrick wrote:

> You asked for it, you got it!
> 
> ...subversion/notes/difftools/pics$ ls -1
> CVS
> FileMerge-README
> FileMerge1.jpg
> FileMerge2.jpg
> FileMerge3.jpg
> FileMerge4.jpg
> FileMerge5.jpg
> README
> ...subversion/notes/difftools/pics$

I have added a screenshot of xxdiff to that directory.

IMHO, the most valuable part of xxdiff is the rightmost pane which
shows, in a compact but readable way, where all the diffs in the file
are, which ones you're keeping, and where you're currently viewing
each file.

-- 
                                        K<bob>
kbob@jogger-egg.com, http://www.jogger-egg.com/