{"thread":{"id":"12562","subject":"Re: [RFH] What do you think about adding graphical merge to git-gui?","startedAt":"2008-03-07T11:54:52Z","lastAt":"2008-03-08T01:19:10Z","messageCount":6,"participants":["Johannes Schindelin","Jakub Narebski","Paul Mackerras"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"71337","messageId":"alpine.LSU.1.00.0803071254310.19395@racer.site","threadId":"12562","inReplyTo":"200803071240.09999.jnareb@gmail.com","subject":"Re: [RFH] What do you think about adding graphical merge to git-gui?","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-03-07T11:54:52Z","receivedAt":"2008-03-07T11:54:52Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 7 Mar 2008, Jakub Narebski wrote:\n\n> What do you think about adding \"merge\" subcommand to git-gui,\n> or to be more exact adding tree-level merge and/or file-level\n> merge tool to git-gui? I think we could \"borrow\" some code from\n> TkDiff: http://tkdiff.sourceforge.net/ (which is also GPL)\n\nIs there any reason not to use mergetool?\n\nCiao,\nDscho\n\n"},{"id":"71348","messageId":"200803071446.39468.jnareb@gmail.com","threadId":"12562","inReplyTo":"alpine.LSU.1.00.0803071254310.19395@racer.site","subject":"Re: [RFH] What do you think about adding graphical merge to git-gui?","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2008-03-07T13:46:37Z","receivedAt":"2008-03-07T13:46:37Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Hello!\n\nDnia piątek 7. marca 2008 12:54, Johannes Schindelin napisał:\n> On Fri, 7 Mar 2008, Jakub Narebski wrote:\n> \n>> What do you think about adding \"merge\" subcommand to git-gui,\n>> or to be more exact adding tree-level merge and/or file-level\n>> merge tool to git-gui? I think we could \"borrow\" some code from\n>> TkDiff: http://tkdiff.sourceforge.net/ (which is also GPL)\n> \n> Is there any reason not to use mergetool?\n\nTo quote original email:\n\n>> Inspired by one of complaints in http://openradix.org/archives/349\n>>\n>> (Merging tools and file servers on Windows are lacking. Windows\n>>  users expect the revision control to supply these tools.)\n\nBesides \"git gui merge\" can be more Git-aware than for example TkDiff\ninvoked from git-mergetool. It can offer also resolution also to tree\nlevel conflicts, such as rename/rename, rename/delete and rename/add,\ndelete/modify or for example the case when one side has file in \nsubdirectory, and other has file in submodule.\n\n-- \nJakub Narebski\nPoland\n"},{"id":"71349","messageId":"alpine.LSU.1.00.0803071453160.19395@racer.site","threadId":"12562","inReplyTo":"200803071446.39468.jnareb@gmail.com","subject":"Re: [RFH] What do you think about adding graphical merge to git-gui?","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-03-07T13:53:44Z","receivedAt":"2008-03-07T13:53:44Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 7 Mar 2008, Jakub Narebski wrote:\n\n> Dnia piątek 7. marca 2008 12:54, Johannes Schindelin napisał:\n> > On Fri, 7 Mar 2008, Jakub Narebski wrote:\n> > \n> >> What do you think about adding \"merge\" subcommand to git-gui,\n> >> or to be more exact adding tree-level merge and/or file-level\n> >> merge tool to git-gui? I think we could \"borrow\" some code from\n> >> TkDiff: http://tkdiff.sourceforge.net/ (which is also GPL)\n> > \n> > Is there any reason not to use mergetool?\n> \n> To quote original email:\n> \n> >> Inspired by one of complaints in http://openradix.org/archives/349\n> >>\n> >> (Merging tools and file servers on Windows are lacking. Windows\n> >>  users expect the revision control to supply these tools.)\n\nIndeed, I had forgotten that, and your mail did not quote it either.\n\n> Besides \"git gui merge\" can be more Git-aware than for example TkDiff \n> invoked from git-mergetool. It can offer also resolution also to tree \n> level conflicts, such as rename/rename, rename/delete and rename/add, \n> delete/modify or for example the case when one side has file in \n> subdirectory, and other has file in submodule.\n\nSure, go ahead.\n\nCiao,\nDscho\n"},{"id":"71351","messageId":"200803071621.37376.jnareb@gmail.com","threadId":"12562","inReplyTo":"alpine.LSU.1.00.0803071453160.19395@racer.site","subject":"Re: [RFH] What do you think about adding graphical merge to git-gui?","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2008-03-07T15:21:35Z","receivedAt":"2008-03-07T15:21:35Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Johannes Schindelin wrote:\n> On Fri, 7 Mar 2008, Jakub Narebski wrote:\n>> Dnia piątek 7. marca 2008 12:54, Johannes Schindelin napisał:\n>>> On Fri, 7 Mar 2008, Jakub Narebski wrote:\n>>> \n>>>> What do you think about adding \"merge\" subcommand to git-gui,\n>>>> or to be more exact adding tree-level merge and/or file-level\n>>>> merge tool to git-gui? I think we could \"borrow\" some code from\n>>>> TkDiff: http://tkdiff.sourceforge.net/ (which is also GPL)\n>>> \n>>> Is there any reason not to use mergetool?\n[...]\n\n>> Besides \"git gui merge\" can be more Git-aware than for example TkDiff \n>> invoked from git-mergetool. It can offer also resolution also to tree \n>> level conflicts, such as rename/rename, rename/delete and rename/add, \n>> delete/modify or for example the case when one side has file in \n>> subdirectory, and other has file in submodule.\n> \n> Sure, go ahead.\n\nCould you recommend some good (best if also free) documentation of \nTcl/Tk, so I won't be doing \"cargo cult\" (copy'n'paste) programming?\n\n-- \nJakub Narebski\nPoland\n"},{"id":"71353","messageId":"alpine.LSU.1.00.0803071626280.19395@racer.site","threadId":"12562","inReplyTo":"200803071621.37376.jnareb@gmail.com","subject":"Re: [RFH] What do you think about adding graphical merge to git-gui?","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-03-07T15:27:21Z","receivedAt":"2008-03-07T15:27:21Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 7 Mar 2008, Jakub Narebski wrote:\n\n> Could you recommend some good (best if also free) documentation of \n> Tcl/Tk, so I won't be doing \"cargo cult\" (copy'n'paste) programming?\n\nAFAIR http://www.tcl.tk/ has some good links to tutorials.\n\nCiao,\nDscho\n\n"},{"id":"71390","messageId":"18385.59790.276210.858893@cargo.ozlabs.ibm.com","threadId":"12562","inReplyTo":"200803071621.37376.jnareb@gmail.com","subject":"Re: [RFH] What do you think about adding graphical merge to git-gui?","fromName":"Paul Mackerras","fromEmail":"paulus@samba.org","sentAt":"2008-03-08T01:19:10Z","receivedAt":"2008-03-08T01:19:10Z","isPatch":false,"sender":{"key":"paulus@samba.org","avatar":"https://avatars.githubusercontent.com/u/1606439?v=4"},"body":"Jakub Narebski writes:\n\n> Could you recommend some good (best if also free) documentation of \n> Tcl/Tk, so I won't be doing \"cargo cult\" (copy'n'paste) programming?\n\nTcl/Tk normally comes with an extensive set of man pages.  Under\nDebian there are tcl8.5-doc and tk8.5-doc packages, for instance, that\ncontain the man pages.  If you have them installed you can do \"man\nTcl\" to get an overview of the language, or \"man lsearch\" if you want\nto find out the arguments, options and semantics for the lsearch\ncommand, or \"man canvas\" if you want to know what the canvas widget\ncan do, and so on.\n\nPaul.\n"}]}