Re: [RFH] What do you think about adding graphical merge to git-gui?

Re: [RFH] What do you think about adding graphical merge to git-gui?

[Johannes Schindelin]

Hi,

On Fri, 7 Mar 2008, Jakub Narebski wrote:

> What do you think about adding "merge" subcommand to git-gui,
> or to be more exact adding tree-level merge and/or file-level
> merge tool to git-gui? I think we could "borrow" some code from
> TkDiff: http://tkdiff.sourceforge.net/ (which is also GPL)

Is there any reason not to use mergetool?

Ciao,
Dscho

Re: [RFH] What do you think about adding graphical merge to git-gui?

[Jakub Narebski]

Hello!

Dnia piątek 7. marca 2008 12:54, Johannes Schindelin napisał:
> On Fri, 7 Mar 2008, Jakub Narebski wrote:
> 
>> What do you think about adding "merge" subcommand to git-gui,
>> or to be more exact adding tree-level merge and/or file-level
>> merge tool to git-gui? I think we could "borrow" some code from
>> TkDiff: http://tkdiff.sourceforge.net/ (which is also GPL)
> 
> Is there any reason not to use mergetool?

To quote original email:

>> Inspired by one of complaints in http://openradix.org/archives/349
>>
>> (Merging tools and file servers on Windows are lacking. Windows
>>  users expect the revision control to supply these tools.)

Besides "git gui merge" can be more Git-aware than for example TkDiff
invoked from git-mergetool. It can offer also resolution also to tree
level conflicts, such as rename/rename, rename/delete and rename/add,
delete/modify or for example the case when one side has file in 
subdirectory, and other has file in submodule.

-- 
Jakub Narebski
Poland

Re: [RFH] What do you think about adding graphical merge to git-gui?

[Johannes Schindelin]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 1160 bytes --]

Hi,

On Fri, 7 Mar 2008, Jakub Narebski wrote:

> Dnia piątek 7. marca 2008 12:54, Johannes Schindelin napisał:
> > On Fri, 7 Mar 2008, Jakub Narebski wrote:
> > 
> >> What do you think about adding "merge" subcommand to git-gui,
> >> or to be more exact adding tree-level merge and/or file-level
> >> merge tool to git-gui? I think we could "borrow" some code from
> >> TkDiff: http://tkdiff.sourceforge.net/ (which is also GPL)
> > 
> > Is there any reason not to use mergetool?
> 
> To quote original email:
> 
> >> Inspired by one of complaints in http://openradix.org/archives/349
> >>
> >> (Merging tools and file servers on Windows are lacking. Windows
> >>  users expect the revision control to supply these tools.)

Indeed, I had forgotten that, and your mail did not quote it either.

> Besides "git gui merge" can be more Git-aware than for example TkDiff 
> invoked from git-mergetool. It can offer also resolution also to tree 
> level conflicts, such as rename/rename, rename/delete and rename/add, 
> delete/modify or for example the case when one side has file in 
> subdirectory, and other has file in submodule.

Sure, go ahead.

Ciao,
Dscho

Re: [RFH] What do you think about adding graphical merge to git-gui?

[Jakub Narebski]

Johannes Schindelin wrote:
> On Fri, 7 Mar 2008, Jakub Narebski wrote:
>> Dnia piątek 7. marca 2008 12:54, Johannes Schindelin napisał:
>>> On Fri, 7 Mar 2008, Jakub Narebski wrote:
>>> 
>>>> What do you think about adding "merge" subcommand to git-gui,
>>>> or to be more exact adding tree-level merge and/or file-level
>>>> merge tool to git-gui? I think we could "borrow" some code from
>>>> TkDiff: http://tkdiff.sourceforge.net/ (which is also GPL)
>>> 
>>> Is there any reason not to use mergetool?
[...]

>> Besides "git gui merge" can be more Git-aware than for example TkDiff 
>> invoked from git-mergetool. It can offer also resolution also to tree 
>> level conflicts, such as rename/rename, rename/delete and rename/add, 
>> delete/modify or for example the case when one side has file in 
>> subdirectory, and other has file in submodule.
> 
> Sure, go ahead.

Could you recommend some good (best if also free) documentation of 
Tcl/Tk, so I won't be doing "cargo cult" (copy'n'paste) programming?

-- 
Jakub Narebski
Poland

Re: [RFH] What do you think about adding graphical merge to git-gui?

[Johannes Schindelin]

Hi,

On Fri, 7 Mar 2008, Jakub Narebski wrote:

> Could you recommend some good (best if also free) documentation of 
> Tcl/Tk, so I won't be doing "cargo cult" (copy'n'paste) programming?

AFAIR http://www.tcl.tk/ has some good links to tutorials.

Ciao,
Dscho

Re: [RFH] What do you think about adding graphical merge to git-gui?

[Paul Mackerras]

Jakub Narebski writes:

> Could you recommend some good (best if also free) documentation of 
> Tcl/Tk, so I won't be doing "cargo cult" (copy'n'paste) programming?

Tcl/Tk normally comes with an extensive set of man pages.  Under
Debian there are tcl8.5-doc and tk8.5-doc packages, for instance, that
contain the man pages.  If you have them installed you can do "man
Tcl" to get an overview of the language, or "man lsearch" if you want
to find out the arguments, options and semantics for the lsearch
command, or "man canvas" if you want to know what the canvas widget
can do, and so on.

Paul.