GNOME Bugzilla – Bug 768344
feature request push/pull current line
Last modified: 2016-07-06 21:50:47 UTC
Created attachment 330816 [details] feature request push/pull current line I really appreciate you making this video, because at least now I can understand what the tool does. However, the attachment is much too large for me to release this to the mailing list. I don't know whether you can upload it to bugzilla or somewhere else, but if so then that would be great. cheers, Kai On 26 June 2016 at 22:59, Claudio Fischer <claudio.fischer@freenet.de> wrote: > here is a screencast that compares the features ALT-Left/Right (move whole > block) > and CTRL-ALT-Left/Right (move one line) of the program CompareIt. > > The program makes kind of suggestion, where to insert the line in the other > file. > > In the screencast there are three samples of merging the files main1.cpp and > main2.cpp attached to my last mail. > > In each sample I have have first done a block move, then undo this, because > it gives > not the desired merge and then done only the necessary line move of code to > describe > this feature a little bit ... > > Cheers, > Claudio > > > > Am 26.06.2016 um 01:25 schrieb Kai Willadsen: >> >> On 20 June 2016 at 22:00, Claudio Fischer <claudio.fischer@freenet.de> >> wrote: >>> >>> Hi, >>> >>> I wanted to bring my feature request long time ago up again >>> Now with some additional info and sample of two files to compare >>> attached. >>> >>> As I wrote, we use wincompare/compareit from Grigsoft: >>> http://www.grigsoft.com/wincmp3.htm >>> This prog exactly does what we want, see my older description and >>> attached >>> samples. >>> The prog is shareware, you can try the features, it only runs on windows. >>> But we also need a powerful compare prog on Linux and like meld very >>> much. >>> Meanwhile compareit also is developed very slowly >>> CompareIt uses the keys Ctrl+Alt Left/Right to copy only the current line >>> and like meld >>> Alt Left/Right to copy the whole block, this logically fits good. >>> See attached sample-files to compare ... >> >> Can you please describe the feature (or post a screencast or >> something) so that people without Windows (or who aren't going to >> install unsigned shareware binaries...) can understand how it works. >> >> Specifically, how do you figure out where to insert the line in the other >> file? >> >> cheers, >> Kai > >
*** This bug has been marked as a duplicate of bug 727600 ***