Re: diff display
John Hasler wrote: Ron Johnson writes: Then that should be: $ patch --gen-diff $ patch --apply-diff The diff command predates the patch command by many years (it was in System III) and does far more than generate files suitable for application by patch, which was written by Larry Wall in 1984. I stand corrected then. I apologize for giving false info. I swear I read it (i.e. main purpose of diff is to generate patches) in some book but could not find it now. raju -- Kamaraju S Kusumanchi http://www.people.cornell.edu/pages/kk288/ http://malayamaarutham.blogspot.com/ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: diff display
On Wed, 10 Sep 2008 23:10:15 +0200, Kamaraju S Kusumanchi [EMAIL PROTECTED] wrote: James A. Donald wrote: Can I get file changes recorded in git to display the way they do in windows? I am surprised that no one has told this till now. The main purpose of diff is to generate a patch which can then be used to apply/revert changes across two versions of a file. The output produced by diff can do that very efficiently. It is very compact and elegant format of showing differences between two files (although it requires a trained eye). If you want to get acquainted with diff output, read its documentation by doing 'info diff'. As for your problem, try vimdiff or gvimdiff (graphical version of vimdiff). These two programs do what you want. gvimdiff seems to do what I want. -- -- We have the right to defend ourselves and our property, because of the kind of animals that we are. True law derives from this right, not from the arbitrary power of the omnipotent state. http://www.jim.com/ James A. Donald -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: [OT] was Re: diff display
On Thu, 11 Sep 2008 00:52:47 -0500 Ron Johnson [EMAIL PROTECTED] wrote: On 09/10/08 22:22, Celejar wrote: On Wed, 10 Sep 2008 12:41:01 -0500 ... (If you ever wonder why so many conservatives in the US dislike the UN [besides the rampant corruption] and the EU, it's because they [the UN and the EU...] spew lots of pretty words, but don't have the testicles to enforce them.) Oh, there are many other good reasons, too. ... but bear in mind Stalin's alleged (some quick googling doesn't turn up a source) rhetorical question How many divisions does the pope have? There was a time when he commanded a huge army... Perhaps, but the point is that his influence outlasted his direct military power. Ron Johnson, Jr. Celejar -- mailmin.sourceforge.net - remote access via secure (OpenPGP) email ssuds.sourceforge.net - A Simple Sudoku Solver and Generator -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: [OT] was Re: diff display
On 09/10/08 22:17, Celejar wrote: On Wed, 10 Sep 2008 13:31:51 +0200 Johannes Wiedersich [EMAIL PROTECTED] wrote: On 2008-09-10 09:52, James A. Donald wrote: We have the right to defend ourselves and our property, because of the kind of animals that we are. True law derives from this right, not from the arbitrary power of the omnipotent state. http://www.jim.com/ James A. Donald I am happy that I am privileged to live in a society that has abandoned that kind of morality that probably was custom around the stone ages, but has since experienced the advancement of civilisation. Your society does not accept the right to defend oneself and one's property? If all rights descend from the government (whether that be an absolute monarchy or a parliament), then I'd posit that no, you don't have a right to defend home and hearth. Did you know that many states have Concealed Carry (each time such a law has been considered, gun control freaks wail that it will turn the state into the Wild West, with daily OK Corral shootouts, but, of course, that has never happened) and Shoot-The-Burglar laws? The home invader doesn't have to threaten you, or even be armed. The mere fact that he/she has illegally broken into your home gives you full rights to shoot the person. -- Ron Johnson, Jr. Jefferson LA USA Do not bite at the bait of pleasure till you know there is no hook beneath it. -- Thomas Jefferson -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: diff display
On 09/10/08 18:49, John Hasler wrote: Ron Johnson writes: Then that should be: $ patch --gen-diff $ patch --apply-diff The diff command predates the patch command by many years (it was in System III) and does far more than generate files suitable for application by patch, which was written by Larry Wall in 1984. Correct. But Kamaraju S Kusumanchi asserts that The main purpose of diff is to generate a patch, and I was pointing out the logical conclusion of his statement. -- Ron Johnson, Jr. Jefferson LA USA Do not bite at the bait of pleasure till you know there is no hook beneath it. -- Thomas Jefferson -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
reply-to-list for icedove? was Re: [OT] was Re: diff display
On 2008-09-10 13:31, Johannes Wiedersich wrote: [snip] I am sorry for having accidentally sent that OT message to list. Does anyone know, if there is a way of fixing the missing 'reply-to-list' functionally of icedove for lenny? Since the extension doesn't work any more, I acquired the habit of always using 'reply-all' and then editing the 'to's and 'cc's manually, but unfortunately this is error prone. Thanks, Johannes signature.asc Description: OpenPGP digital signature
Re: reply-to-list for icedove? was Re: [OT] was Re: diff display
Johannes Wiedersich a écrit : On 2008-09-10 13:31, Johannes Wiedersich wrote: [snip] I am sorry for having accidentally sent that OT message to list. Does anyone know, if there is a way of fixing the missing 'reply-to-list' functionally of icedove for lenny? Since the extension doesn't work any more, I acquired the habit of always using 'reply-all' and then editing the 'to's and 'cc's manually, but unfortunately this is error prone. Thanks, Johannes I have reply to mailing list 0.3.1 and it works ok with Icedove here. https://addons.mozilla.org/fr/thunderbird/addon/4455 It is considered experimental on Mozilla website I just noticed, but never had a problem with it. Tom -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: reply-to-list for icedove? was Re: [OT] was Re: diff display
On 2008-09-11 09:41, thveillon.debian wrote: I have reply to mailing list 0.3.1 and it works ok with Icedove here. https://addons.mozilla.org/fr/thunderbird/addon/4455 It is considered experimental on Mozilla website I just noticed, but never had a problem with it. Thanks. It doesn't work for me, though. I went through the hazzle of having to register myself just for the download, but their server doesn't accept it. Apparently one of their authenticy checks is blocked by adblock or noscript and I am too lazy to iterate this further -- just for a simple download... It'd be great if anyone could send me that download off-list. Thanks in advance! Johannes signature.asc Description: OpenPGP digital signature
Re: [OT] was Re: diff display
Ron Johnson wrote: (If you ever wonder why so many conservatives in the US dislike the UN [besides the rampant corruption] and the EU, it's because they [the UN and the EU...] spew lots of pretty words, but don't have the testicles to enforce them.) In the UN's case it was specifically designed without balls, these have to be added by the member nations in the form of peace-keeping etc. forces. So the problem with the UN is a collective failure of all the member nations, including the US, to actually make something more than words of it's resolutions. As for the EU what makes you think it's laws aren't enforced? When a member state does something against an EU law it uses legal means/financial penalties to enforce the law, not force of arms. Probably similar to if a US state were to pass an unconstitutional law - the US govt. wouldn't send in the military, would they? Why some in the US hate the EU so much I don't know, but I'd guess it has something to do with disliking anyone who could potentially challenge the US as the world's *only* superpower - whether it be a united Europe, China, or Australia armed with nuclear powered Kangaroos and sharks with laser beams :) (we could do it you know - don't try and stop us!) enough OT politics anyway, I'm getting back to work.. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: reply-to-list for icedove? was Re: [OT] was Re: diff display
On 2008-09-11 09:41, thveillon.debian wrote: I have reply to mailing list 0.3.1 and it works ok with Icedove here. https://addons.mozilla.org/fr/thunderbird/addon/4455 It is considered experimental on Mozilla website I just noticed, but never had a problem with it. Thanks! It works here, too. Piece of evidence: this very mail. In order to download it from the Mozilla page, one has to register for an account. Apparently this is only possible, if one - allows Java and Javascript - ignores firefox's / iceweasel's warning that the security of the site is broken and allows unencryped data from an untrusted third site to spoil the secure connection to mozilla.com. (Red broken Lock symbol at the bottom right of the browser. ) I really think it's a shame that this happens on the website of those people who some years ago put a lot of effort into making web browsing more secure for millions of users. I'm really disappointed about that, and slightly worried whether they really take security serious. Johannes signature.asc Description: OpenPGP digital signature
Re: [OT] was Re: diff display
On Thu, Sep 11, 2008 at 11:08:40AM +0200, Tim Edwards wrote: ..., or Australia armed with nuclear powered Kangaroos and sharks with laser beams :) (we could do it you know - don't try and stop us!) I thought the Kiwis did all the development stuff Dave -- ... (I tried to get some documentation out of Digital on this, but as far as I can tell even _they_ don't have it ;-) -- Linus Torvalds, in an article on a dnserver -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: reply-to-list for icedove? was Re: [OT] was Re: diff display
On 09/11/08 02:53, Johannes Wiedersich wrote: On 2008-09-11 09:41, thveillon.debian wrote: I have reply to mailing list 0.3.1 and it works ok with Icedove here. https://addons.mozilla.org/fr/thunderbird/addon/4455 It is considered experimental on Mozilla website I just noticed, but never had a problem with it. Thanks. It doesn't work for me, though. I went through the hazzle of having to register myself just for the download, but their server doesn't accept it. Apparently one of their authenticy checks is blocked by adblock or noscript and I am too lazy to iterate this further -- just for a simple download... It'd be great if anyone could send me that download off-list. This works for me: http://members.cox.net/ron.l.johnson/replytolist-0.2.1.xpi v0.3.0 fails, since I use IMAP. I think that you need to install the Mnenhy add-on. -- Ron Johnson, Jr. Jefferson LA USA Do not bite at the bait of pleasure till you know there is no hook beneath it. -- Thomas Jefferson -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: [OT] was Re: diff display
On 2008-Sep-11, at 5:08 AM, Tim Edwards wrote: Ron Johnson wrote: (If you ever wonder why so many conservatives in the US dislike the UN [besides the rampant corruption] and the EU, it's because they [the UN and the EU...] spew lots of pretty words, but don't have the testicles to enforce them.) In the UN's case it was specifically designed without balls, these have to be added by the member nations in the form of peace-keeping etc. forces. Good point. I'm kinda glad they aren't that aggressive because who do you think they'd come after first? In fact, I think the reason they accomplish so little is not that they have no balls. It's because deep down, they think rape, slavery, and genocide are only crimes if perpetrated by capitalists. For everyone else, they'll just kinda get to it when they get to it (which is never). Why some in the US hate the EU so much I don't know, but I'd guess it has something to do with disliking anyone who could potentially challenge the US as the world's *only* superpower - whether it be a united Europe, China, or Australia armed with nuclear powered Kangaroos and sharks with laser beams :) (we could do it you know - don't try and stop us!) Free societies aren't a threat to one another. We don't like the EU because of their complete disregard for individual rights. It was conceived of and implemented by socialists. It's that simple. --- Rob McBroom http://www.skurfer.com/ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: [OT] was Re: diff display
Dismissing most of this because it's little more than an expression of the author's prejudice, but... We don't like the EU because of their complete disregard for individual rights. It was conceived of and implemented by socialists. It's that simple. Socialists? You mean the kind of people who would devote massive amounts of their free time, with no expectation of compensation, to building and distributing a totally free operating system, purely because they believe it would be beneficial to society? And who put in place legal safeguards to ensure that it would protect the rights of its contributors by remaining forever free, and the rights of its users by remaining forever modifiable? Yeah, I hate those guys. On Thu, Sep 11, 2008 at 10:45 AM, Rob McBroom [EMAIL PROTECTED] wrote: On 2008-Sep-11, at 5:08 AM, Tim Edwards wrote: Ron Johnson wrote: (If you ever wonder why so many conservatives in the US dislike the UN [besides the rampant corruption] and the EU, it's because they [the UN and the EU...] spew lots of pretty words, but don't have the testicles to enforce them.) In the UN's case it was specifically designed without balls, these have to be added by the member nations in the form of peace-keeping etc. forces. Good point. I'm kinda glad they aren't that aggressive because who do you think they'd come after first? In fact, I think the reason they accomplish so little is not that they have no balls. It's because deep down, they think rape, slavery, and genocide are only crimes if perpetrated by capitalists. For everyone else, they'll just kinda get to it when they get to it (which is never). Why some in the US hate the EU so much I don't know, but I'd guess it has something to do with disliking anyone who could potentially challenge the US as the world's *only* superpower - whether it be a united Europe, China, or Australia armed with nuclear powered Kangaroos and sharks with laser beams :) (we could do it you know - don't try and stop us!) Free societies aren't a threat to one another. We don't like the EU because of their complete disregard for individual rights. It was conceived of and implemented by socialists. It's that simple. --- Rob McBroom http://www.skurfer.com/ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED] -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: [OT] was Re: diff display
On 09/11/08 12:19, Jeff Soules wrote: Dismissing most of this because it's little more than an expression of the author's prejudice, but... We don't like the EU because of their complete disregard for individual rights. It was conceived of and implemented by socialists. It's that simple. Socialists? You mean the kind of people who would devote massive amounts of their free time, with no expectation of compensation, to building and distributing a totally free operating system, purely because they believe it would be beneficial to society? And who put in place legal safeguards to ensure that it would protect the rights of its contributors by remaining forever free, and the rights of its users by remaining forever modifiable? Except... that's not what a Socialist (one who follows/believes in Socialism) is. Modern Socialism has more to do with heavy state involvement in the economy, protection of local industry and wealth transfer from the Haves to the Have Nots. (Yes, the US is quite the socialist nation. If people can vote for bread and circuses, they eventually will.) Yeah, I hate those guys. You hate the wrong guys. -- Ron Johnson, Jr. Jefferson LA USA Do not bite at the bait of pleasure till you know there is no hook beneath it. -- Thomas Jefferson -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: [OT] was Re: diff display
Ron Johnson wrote: On 09/11/08 12:19, Jeff Soules wrote: Dismissing most of this because it's little more than an expression of the author's prejudice, but... We don't like the EU because of their complete disregard for individual rights. It was conceived of and implemented by socialists. It's that simple. Socialists? You mean the kind of people who would devote massive amounts of their free time, with no expectation of compensation, to building and distributing a totally free operating system, purely because they believe it would be beneficial to society? And who put in place legal safeguards to ensure that it would protect the rights of its contributors by remaining forever free, and the rights of its users by remaining forever modifiable? Except... that's not what a Socialist (one who follows/believes in Socialism) is. Modern Socialism has more to do with heavy state involvement in the economy, protection of local industry and wealth transfer from the Haves to the Have Nots. I understand that state-sponsored social programs in the US get the label Socialism, but Modern is not a very good adjective for distinguishing socialist ideas. I identify strongly as a Socialist, but my socialism is the libertian socialism of projects like Debian (as Jeff described it). The Anarchist FAQ tends to explain Libertarian Socialism well: http://www.infoshop.org/faq/index.html - Chris Burkhardt -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: reply-to-list for icedove? was Re: [OT] was Re: diff display
Ron Johnson wrote: This works for me: http://members.cox.net/ron.l.johnson/replytolist-0.2.1.xpi v0.3.0 fails, since I use IMAP. I think that you need to install the Mnenhy add-on. Yes, downgrading to 0.2.1 works for me also. I don't think Icedove needs Mnenhy (but stock Thunderbird 2.x builds do). - Chris -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: [OT] was Re: diff display
If all rights descend from the government (whether that be an absolute monarchy or a parliament), then I'd posit that no, you don't have a right to defend home and hearth. That doesn't follow. If rights descend from the government, then you have a right to defend home and hearth if the government defines such a right (though many governments choose to define instead the right for home and hearth to be defended, by duly appointed authorities). Conversely, if rights come from Nature, that doesn't in itself demonstrate that you have a right to defend home and hearth. It happens to be one of the first rights that the natural-rights folks claim, but it needs a separate proof; one could just as well say that all people have a natural right to warmth and shelter, which invalidates others' rights not to share hearth and home. There's a useful distinction here between rights in the legal sense (You have the right to remain silent, which you didn't before Miranda v. Arizona, and you don't in every country), which are obviously socially defined, and rights in a universalist natural-rights sense. Natural-rights-as-an-inherent-part-of-humanity do not exist, because there is no objective way to measure or test them. If we say Every man has three hearts, we can find out just by cutting up a fresh corpse. If we say Every man has the right to three wives, the proof/disproof cannot be based on observation, only speculative argument. The hearts are objective fact; the wives are theology. Just so, saying People have a natural right to self-defense is not a statement about people, it's a statement about the speaker's belief system, roughly equal to I would not blame anyone or take action against them for practicing self-defense. And attempts to prove that such a right exists can only take the form of attempts to convince others to share that belief. The question What natural rights exist? is still useful, when properly understood as being the equivalent to What legal rights should everyone have? And I should point out, I probably agree with most list-members' judgments about that; and I feel just as strongly as anyone else about the matter. I just don't claim that rights exist in some metaphysical plane; I'm willing to acknowledge that they're a social agreement. So, um, how about that Debian, huh? On Thu, Sep 11, 2008 at 2:08 AM, Ron Johnson [EMAIL PROTECTED] wrote: On 09/10/08 22:17, Celejar wrote: On Wed, 10 Sep 2008 13:31:51 +0200 Johannes Wiedersich [EMAIL PROTECTED] wrote: On 2008-09-10 09:52, James A. Donald wrote: We have the right to defend ourselves and our property, because of the kind of animals that we are. True law derives from this right, not from the arbitrary power of the omnipotent state. http://www.jim.com/ James A. Donald I am happy that I am privileged to live in a society that has abandoned that kind of morality that probably was custom around the stone ages, but has since experienced the advancement of civilisation. Your society does not accept the right to defend oneself and one's property? If all rights descend from the government (whether that be an absolute monarchy or a parliament), then I'd posit that no, you don't have a right to defend home and hearth. Did you know that many states have Concealed Carry (each time such a law has been considered, gun control freaks wail that it will turn the state into the Wild West, with daily OK Corral shootouts, but, of course, that has never happened) and Shoot-The-Burglar laws? The home invader doesn't have to threaten you, or even be armed. The mere fact that he/she has illegally broken into your home gives you full rights to shoot the person. -- Ron Johnson, Jr. Jefferson LA USA -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: reply-to-list for icedove? was Re: [OT] was Re: diff display
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 thveillon.debian wrote: Johannes Wiedersich a écrit : On 2008-09-10 13:31, Johannes Wiedersich wrote: [snip] I am sorry for having accidentally sent that OT message to list. Does anyone know, if there is a way of fixing the missing 'reply-to-list' functionally of icedove for lenny? Since the extension doesn't work any more, I acquired the habit of always using 'reply-all' and then editing the 'to's and 'cc's manually, but unfortunately this is error prone. Thanks, Johannes I have reply to mailing list 0.3.1 and it works ok with Icedove here. https://addons.mozilla.org/fr/thunderbird/addon/4455 It is considered experimental on Mozilla website I just noticed, but never had a problem with it. Tom OOOh thanks! That's brilliant :D - -- Rich Healey - iTReign \/ [EMAIL PROTECTED] Developer / Systems Admin \ /[EMAIL PROTECTED] AIM: richohealey33 \/ [EMAIL PROTECTED] MSN: [EMAIL PROTECTED] \__/ [EMAIL PROTECTED] -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAkjJyxgACgkQLeTfO4yBSAdvJQCdFPCs/pRXdybRmX/Nc0LYV/1M 1a0AoKk7nBI14QpDKwm5SVuSmGcjs1zf =wiQm -END PGP SIGNATURE- -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
diff display
Under windows, diff usually works like windiff - you see the two versions side by side, with the differences highlighted by color git-gui, however gives me a diff where I see a single stream annotated with + and - I find the single stream display really obscure, ugly, and confusing. So if I had a file that used to be first error anoth more again And it was changed to first anoth new again Then the linux tools I have now would display the changes as first -error anoth -more +new again While the windows tools I am used to would display it as two streams side by side first first -error anoth anoth -more +new again again but with color highlighting instead of + and - Can I get file changes recorded in git to display the way they do in windows? -- -- We have the right to defend ourselves and our property, because of the kind of animals that we are. True law derives from this right, not from the arbitrary power of the omnipotent state. http://www.jim.com/ James A. Donald -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: diff display
I recommend meld package See you later ! On Wed, Sep 10, 2008 at 9:52 AM, James A. Donald [EMAIL PROTECTED] wrote: Under windows, diff usually works like windiff - you see the two versions side by side, with the differences highlighted by color git-gui, however gives me a diff where I see a single stream annotated with + and - I find the single stream display really obscure, ugly, and confusing. So if I had a file that used to be first error anoth more again And it was changed to first anoth new again Then the linux tools I have now would display the changes as first -error anoth -more +new again While the windows tools I am used to would display it as two streams side by side first first -error anoth anoth -more +new again again but with color highlighting instead of + and - Can I get file changes recorded in git to display the way they do in windows? -- -- We have the right to defend ourselves and our property, because of the kind of animals that we are. True law derives from this right, not from the arbitrary power of the omnipotent state. http://www.jim.com/ James A. Donald -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: diff display
On Wed,10.Sep.08, 17:52:49, James A. Donald wrote: [...] Can I get file changes recorded in git to display the way they do in windows? I'm almost sure it can be done by combining git with a tool like vimdiff (vim actually, but I'm sure emacs has something similar). Regards, Andrei -- If you can't explain it simply, you don't understand it well enough. (Albert Einstein) signature.asc Description: Digital signature
Re: diff display
Le Mer 10 septembre 2008 09:52, James A. Donald a écrit : [...] Can I get file changes recorded in git to display the way they do in windows? I use Mercurial instead of GIT, but it is very close. I use it under Unix (Solaris and Linux) and Windows. And I use KDiff3 under Unix and Windows too. It can do three-file merge, has color highlight and can also do directory diff. So, if Git can use it, I recommend KDiff3 Fanfan -- http://www.cerbelle.net - http://www.afdm-idf.org -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: diff display
On 2008-09-10 09:52, James A. Donald wrote: Under windows, diff usually works like windiff - you see the two versions side by side, with the differences highlighted by color git-gui, however gives me a diff where I see a single stream annotated with + and - I find the single stream display really obscure, ugly, and confusing. Linux's diff by default works this way, because most people here consider it more easy to spot differences on longer lines, if they are placed on top of each other. Tools like kdiff3 have a side by side view. To obtain this result on the command line use diff's -y option. I guess it just takes a bit of getting used to. but with color highlighting instead of + and - On the comand line you get color highlighting by means of git's --color option. (See 'man git-diff'). These settings can be made permanent by putting them in your .gitconf. As an example here is part of mine: /- [color] branch = auto diff = auto status = auto [color branch] current = green reverse local = blue remote = yellow [color diff] meta = green bold frag = magenta bold old = red bold new = blue bold [color status] added = blue bold changed = yellow bold untracked = cyan bold \- I don't know, if this will activate colors for the gui, though. (Just tried it myself: at least I get colors on lenny.) Can I get file changes recorded in git to display the way they do in windows? /rhetorical question If you insist that things in linux should be just like in windows, why bother using linux? rhetorical question Sorry I can't help you with your side-by-side issue. I'm sure it wouldn't be to difficult to write a little script that temporarily clones a certain state of your git project to a different file location and invokes kdiff3 on the tree and it's copy. HTH, Johannes signature.asc Description: OpenPGP digital signature
Re: diff display
On 09/10/08 04:04, Johannes Wiedersich wrote: On 2008-09-10 09:52, James A. Donald wrote: [snip] Can I get file changes recorded in git to display the way they do in windows? /rhetorical question If you insist that things in linux should be just like in windows, why bother using linux? rhetorical question And he uses in windows like fancy GUI file diffing is built into the OS, as opposed to it being part of a S.C.C.S. that runs under Windows. Makes me suspicious. -- Ron Johnson, Jr. Jefferson LA USA Do not bite at the bait of pleasure till you know there is no hook beneath it. -- Thomas Jefferson -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: diff display
On Wed, Sep 10, 2008 at 05:52:49PM +1000, James A. Donald wrote: Can I get file changes recorded in git to display the way they do in windows? You can also look ast colordiff (http://freshmeat.net/projects/colordiff/). I have not used it though. Regards Johann -- Johann Spies Telefoon: 021-808 4036 Informasietegnologie, Universiteit van Stellenbosch Draw nigh to God, and he will draw nigh to you. Cleanse your hands, ye sinners; and purify your hearts, ye double minded. James 4:8 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: diff display
On 2008-09-10 11:18, Johann Spies wrote: On Wed, Sep 10, 2008 at 05:52:49PM +1000, James A. Donald wrote: Can I get file changes recorded in git to display the way they do in windows? You can also look ast colordiff (http://freshmeat.net/projects/colordiff/). I have not used it though. colordiff can be used as a drop-in replacement for diff. I use it on a daily basis, though IMHO the better way for git is to use its built in color management. Cheers, Johannes Regards Johann signature.asc Description: OpenPGP digital signature
[OT] was Re: diff display
On 2008-09-10 09:52, James A. Donald wrote: We have the right to defend ourselves and our property, because of the kind of animals that we are. True law derives from this right, not from the arbitrary power of the omnipotent state. http://www.jim.com/ James A. Donald I am happy that I am privileged to live in a society that has abandoned that kind of morality that probably was custom around the stone ages, but has since experienced the advancement of civilisation. I am sorry to hear that this apparently is not the case for you. (This is not to say, that all people live up to higher moral standards than arbitrary law, but society itself, fortunately!, does. ) Regards, Johannes Wiedersich signature.asc Description: OpenPGP digital signature
Re: [OT] was Re: diff display
On 2008-Sep-10, at 7:31 AM, Johannes Wiedersich wrote: On 2008-09-10 09:52, James A. Donald wrote: We have the right to defend ourselves and our property, because of the kind of animals that we are. True law derives from this right, not from the arbitrary power of the omnipotent state. http://www.jim.com/ James A. Donald I am happy that I am privileged to live in a society that has abandoned that kind of morality that probably was custom around the stone ages, but has since experienced the advancement of civilisation. Umm. The quote is about rights. Rights are an intrinsic part of every person. They don't change depending on where (or when) you live. And rights have nothing to do with need. If you never need to defend yourself, good for you. But you still have a right to. --- Rob McBroom http://www.skurfer.com/ --- Rob McBroom http://www.skurfer.com/ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: [OT] was Re: diff display
On 09/10/08 09:39, Rob McBroom wrote: On 2008-Sep-10, at 7:31 AM, Johannes Wiedersich wrote: On 2008-09-10 09:52, James A. Donald wrote: We have the right to defend ourselves and our property, because of the kind of animals that we are. True law derives from this right, not from the arbitrary power of the omnipotent state. http://www.jim.com/ James A. Donald I am happy that I am privileged to live in a society that has abandoned that kind of morality that probably was custom around the stone ages, but has since experienced the advancement of civilisation. Umm. The quote is about rights. Rights are an intrinsic part of every person. They don't change depending on where (or when) you live. And rights have nothing to do with need. If you never need to defend yourself, good for you. But you still have a right to. The one place where I might disagree with the Declaration of Independence is where Rights come from, since I want to think that rights come from the barrel of a gun. Or, maybe, that those unalienable Rights are pretty useless unless backed by force of arms. Examples: the Revolutionary War and integration of southern public schools. -- Ron Johnson, Jr. Jefferson LA USA Do not bite at the bait of pleasure till you know there is no hook beneath it. -- Thomas Jefferson -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: diff display
James A. Donald wrote: Can I get file changes recorded in git to display the way they do in windows? I am surprised that no one has told this till now. The main purpose of diff is to generate a patch which can then be used to apply/revert changes across two versions of a file. The output produced by diff can do that very efficiently. It is very compact and elegant format of showing differences between two files (although it requires a trained eye). If you want to get acquainted with diff output, read its documentation by doing 'info diff'. As for your problem, try vimdiff or gvimdiff (graphical version of vimdiff). These two programs do what you want. regards raju -- Kamaraju S Kusumanchi http://www.people.cornell.edu/pages/kk288/ http://malayamaarutham.blogspot.com/ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: diff display
On 09/10/08 16:03, Kamaraju S Kusumanchi wrote: James A. Donald wrote: Can I get file changes recorded in git to display the way they do in windows? I am surprised that no one has told this till now. The main purpose of diff is to generate a patch which can then be used to apply/revert changes across two versions of a file. That would sanely be called patch, not diff. The output produced by diff can do that very efficiently. It is very compact and elegant format of showing differences between two files (although it requires a trained eye). If you want to get acquainted with diff output, read its documentation by doing 'info diff'. As for your problem, try vimdiff or gvimdiff (graphical version of vimdiff). These two programs do what you want. -- Ron Johnson, Jr. Jefferson LA USA Do not bite at the bait of pleasure till you know there is no hook beneath it. -- Thomas Jefferson -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: diff display
Ron Johnson wrote: On 09/10/08 16:03, Kamaraju S Kusumanchi wrote: snip The main purpose of diff is to generate a patch which can then be used to apply/revert changes across two versions of a file. That would sanely be called patch, not diff. See man patch. diff consists of differences between files, and patch folds those differences back into the original. snip cheers, gary -- Anyone can make a usable web site. It takes a graphic designer to make it slow, confusing and painful to use. begin:vcard fn:Gary Turner n:Turner;Gary org:Gary Turner, Web Developer adr:;;USA email;internet:[EMAIL PROTECTED] title:Czar x-mozilla-html:FALSE url:http://gtwebdev.com/ version:2.1 end:vcard
Re: diff display
On 09/10/08 18:28, gary turner wrote: Ron Johnson wrote: On 09/10/08 16:03, Kamaraju S Kusumanchi wrote: snip The main purpose of diff is to generate a patch which can then be used to apply/revert changes across two versions of a file. That would sanely be called patch, not diff. See man patch. diff consists of differences between files, and patch folds those differences back into the original. Then that should be: $ patch --gen-diff $ patch --apply-diff -- Ron Johnson, Jr. Jefferson LA USA Do not bite at the bait of pleasure till you know there is no hook beneath it. -- Thomas Jefferson -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: diff display
Ron Johnson wrote: On 09/10/08 18:28, gary turner wrote: Ron Johnson wrote: On 09/10/08 16:03, Kamaraju S Kusumanchi wrote: snip The main purpose of diff is to generate a patch which can then be used to apply/revert changes across two versions of a file. That would sanely be called patch, not diff. See man patch. diff consists of differences between files, and patch folds those differences back into the original. Then that should be: $ patch --gen-diff $ patch --apply-diff There is a measure of logic there. Having both is in line with the philosophy of do one thing, do it well. There are a number of uses for diff where folding back into the original is not a part of the deal—thus, no patch. cheers, gary -- Anyone can make a usable web site. It takes a graphic designer to make it slow, confusing and painful to use. begin:vcard fn:Gary Turner n:Turner;Gary org:Gary Turner, Web Developer adr:;;USA email;internet:[EMAIL PROTECTED] title:Czar x-mozilla-html:FALSE url:http://gtwebdev.com/ version:2.1 end:vcard
Re: diff display
Ron Johnson writes: Then that should be: $ patch --gen-diff $ patch --apply-diff The diff command predates the patch command by many years (it was in System III) and does far more than generate files suitable for application by patch, which was written by Larry Wall in 1984. -- John Hasler -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: [OT] was Re: diff display
On Wed, 10 Sep 2008 13:31:51 +0200 Johannes Wiedersich [EMAIL PROTECTED] wrote: On 2008-09-10 09:52, James A. Donald wrote: We have the right to defend ourselves and our property, because of the kind of animals that we are. True law derives from this right, not from the arbitrary power of the omnipotent state. http://www.jim.com/ James A. Donald I am happy that I am privileged to live in a society that has abandoned that kind of morality that probably was custom around the stone ages, but has since experienced the advancement of civilisation. Your society does not accept the right to defend oneself and one's property? Johannes Wiedersich Celejar -- mailmin.sourceforge.net - remote access via secure (OpenPGP) email ssuds.sourceforge.net - A Simple Sudoku Solver and Generator -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: [OT] was Re: diff display
On Wed, 10 Sep 2008 12:41:01 -0500 Ron Johnson [EMAIL PROTECTED] wrote: ... The one place where I might disagree with the Declaration of Independence is where Rights come from, since I want to think that rights come from the barrel of a gun. You do? Or, maybe, that those unalienable Rights are pretty useless unless backed by force of arms. Examples: the Revolutionary War and integration of southern public schools. This is certainly true, but bear in mind Stalin's alleged (some quick googling doesn't turn up a source) rhetorical question How many divisions does the pope have? Ron Johnson, Jr. Celejar -- mailmin.sourceforge.net - remote access via secure (OpenPGP) email ssuds.sourceforge.net - A Simple Sudoku Solver and Generator -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: [OT] was Re: diff display
On 09/10/08 22:22, Celejar wrote: On Wed, 10 Sep 2008 12:41:01 -0500 Ron Johnson [EMAIL PROTECTED] wrote: ... The one place where I might disagree with the Declaration of Independence is where Rights come from, since I want to think that rights come from the barrel of a gun. You do? Or, maybe, that those unalienable Rights are pretty useless unless backed by force of arms. Examples: the Revolutionary War and integration of southern public schools. This is certainly true, I guess this is the debate between the practical and the theoretical. What's the point of having nice words on a piece of paper if you aren't willing to enforce it. (If you ever wonder why so many conservatives in the US dislike the UN [besides the rampant corruption] and the EU, it's because they [the UN and the EU...] spew lots of pretty words, but don't have the testicles to enforce them.) Given the state of race and police relations 40 years ago, the Black Panthers were right to pick up arms to defend themselves. If they had stayed on the straight and narrow path, they would have (eventually) gained respect from conservative elements of white society. but bear in mind Stalin's alleged (some quick googling doesn't turn up a source) rhetorical question How many divisions does the pope have? There was a time when he commanded a huge army... -- Ron Johnson, Jr. Jefferson LA USA Do not bite at the bait of pleasure till you know there is no hook beneath it. -- Thomas Jefferson -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: [OT] was Re: diff display
On Thu, Sep 11, 2008 at 12:52:47AM -0500, Ron Johnson wrote: There was a time when he commanded a huge army... Not just (a) huge army, but LOTS of huge armies. He commanded kings. Regards, Dave -- Thasai, Ampoe Meuang | Linux - Das System fuer schlaue Nonthaburi | Maedchen ;) Thailand | -- banshee -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
