Re: How to Import a bitkeeper repo into git

From: Marco Costalba <mcostalba@gmail.com>
Date: Oct 16, 2007, 04:56 UTC
Message-ID: <e5bfff550710152156t33ba10dam6171e3210c18d3ac@mail.gmail.com>
In-Reply-To: <471433F3.40606@bluelane.com>

On 10/16/07, Pete/Piet Delaney <pete@bluelane.com> wrote:

Show 5 quoted lines

>
> I just download 'meld', looks interesting, I didn't know about it or
> 'kompare'. Linking either one into gitk would be a pleasant graphical
> 'bling'.
>

In case you are interested a git GUI viewer called qgit can spawn 'Kompare' , 'Meld' or any other diff tool that support 'two files' command line interface:

$my_preferred_diff_tool  file1.txt file2.txt

And they will show what you are looking for. The input files are prepared by qgit that also handles the housekeeping at the end.

Another feature you asked, i.e. CTRL + right click to select a revision (different from the parent) to diff against the current one is also already implemented.

And of course the two above features can be integrated: you select two random revisions and then call the external diff viewer to check at the differences in the way you prefer.

It is possible to download qgit from

http://sourceforge.net/project/showfiles.php?group_id=139897

Two versions:

qgit-1.5.7 is Qt3 based

qgit-2.0 is Qt4 based (works also under Windows)

regards Marco