Re: Subversion Lifetime Achievement Award (was Re: GNU diff)

2011-02-07 Thread H.Merijn Brand
On Mon, 07 Feb 2011 08:17:41 -0500, Numien wrote: > On 02/07/2011 08:11 AM, Gert Doering wrote: > > On Mon, Feb 07, 2011 at 10:44:46AM +, Nicholas Clark wrote: > >> So it's time for Apple to write a version control system? > > > > Now that would be quite definite on the policy side of things.

Re: Subversion Lifetime Achievement Award (was Re: GNU diff)

2011-02-07 Thread Numien
On 02/07/2011 08:11 AM, Gert Doering wrote: On Mon, Feb 07, 2011 at 10:44:46AM +, Nicholas Clark wrote: So it's time for Apple to write a version control system? Now that would be quite definite on the policy side of things. OTOH, I wouldn't really like to be required to register at iTune

Re: Subversion Lifetime Achievement Award (was Re: GNU diff)

2011-02-07 Thread Gert Doering
Hi, On Mon, Feb 07, 2011 at 10:44:46AM +, Nicholas Clark wrote: > So it's time for Apple to write a version control system? Now that would be quite definite on the policy side of things. OTOH, I wouldn't really like to be required to register at iTunes and present a credit card before being

Turning applications into browser plug-ins. (was Re: vshpere client installer)

2011-02-07 Thread Peter da Silva
On 2011-02-07, at 06:39, Gert Doering wrote: (But this is still better than the vmware server 2.0 plug-in for firefox under linux... which ships half a unix OS in bundled libraries...) The idea that it's somehow easier to install an application by turning it into a browser plug-in or extension

no reflog (Re: Subversion Lifetime Achievement Award)

2011-02-07 Thread Peter da Silva
On 2011-02-06, at 08:52, Aristotle Pagaltzis wrote: Yeah. I think this needs to be advertised much more loudly than it is. One of my highest-voted "real" answers at Stack Overflow is for precisely that question: http://stackoverflow.com/questions/89332/recover-dropped-stash-in-git/91795#91795 (T

Re: Subversion Lifetime Achievement Award (was Re: GNU diff)

2011-02-07 Thread Peter da Silva
On 2011-02-06, at 04:10, Aristotle Pagaltzis wrote: You probably want this instead: git stash git reset --hard HEAD^ git stash pop It will move your HEAD ref back one commit and throw away the changes from that commit, but will preserve any delta between it and your working copy. If to

There's more than one way to do it

2011-02-07 Thread Peter da Silva
On 2011-02-06, at 04:57, Nicholas Clark wrote: It's somewhat like Perl, in that "there's more than one way to do it" and "make hard things possible". Unfortunately it missed the "make easy things easy". Perl confuses "there is more than one way to do it" with "let's come up with half a dozen d

Re: Subversion Lifetime Achievement Award (was Re: GNU diff)

2011-02-07 Thread Aristotle Pagaltzis
* Philippe Bruhat (BooK) [2011-02-07 09:50]: > > You probably want this instead: > > > > git stash > > git reset --hard HEAD^ > > git stash pop > > > > THIS is a git undo button. > > --mixed > Resets the index but not the working tree (i.e., the > changed files are preser

Re: vshpere client installer

2011-02-07 Thread Gert Doering
Hi, On Mon, Feb 07, 2011 at 06:35:27AM -0600, Peter da Silva wrote: > There is no VSphere client. There's a bunch of VSphere clients that get run > depending on what VMware server you connect to, so the VSphere client > installer is really a meta-installer wrapped around all the separate > indi

Re: Subversion Lifetime Achievement Award (was Re: GNU diff)

2011-02-07 Thread Peter Corlett
On Mon, Feb 07, 2011 at 10:44:46AM +, Nicholas Clark wrote: [...] > So it's time for Apple to write a version control system? At least that > would have a consistent way to do it. :-) Apple's XCode IDE currently supports CVS, Perforce and Subversion. Given the relative similarity between those

Re: Subversion Lifetime Achievement Award (was Re: GNU diff)

2011-02-07 Thread Peter Corlett
On Mon, Feb 07, 2011 at 01:02:13AM +, Simon Wistow wrote: [...] > Part of the problem is that, as Nick mentioned, there's more than one way > to do it. But the ways are generally mutually exclusive so at each company > you go to you have to learn what their work flow is. So git just defines me

Re: Subversion Lifetime Achievement Award (was Re: GNU diff)

2011-02-07 Thread Nicholas Clark
On Mon, Feb 07, 2011 at 10:42:02AM +, Peter Corlett wrote: > On Mon, Feb 07, 2011 at 01:02:13AM +, Simon Wistow wrote: > [...] > > Part of the problem is that, as Nick mentioned, there's more than one way > > to do it. But the ways are generally mutually exclusive so at each company > > you

Re: Subversion Lifetime Achievement Award (was Re: GNU diff)

2011-02-07 Thread Nicholas Clark
On Mon, Feb 07, 2011 at 01:02:13AM +, Simon Wistow wrote: > Sure it's nice sometimes to work offline (although how many times am I > *actually* off line). But, you know, I had SVK for that and that worked > fine. > > But seriously - I encounter more problems every week with Git than I > th

Re: vshpere client installer

2011-02-07 Thread Peter da Silva
There is no VSphere client. There's a bunch of VSphere clients that get run depending on what VMware server you connect to, so the VSphere client installer is really a meta-installer wrapped around all the separate individual installers included with the version you downloaded. Even if there's

Re: HP diagnostic

2011-02-07 Thread Peter da Silva
Having worked at HP on the MSA1500 and MSA2000 software, I will just note that hateful as ACUCLI is (and you have only scratched the surface) it's small potatoes compared to some of the stuff we had to deal with internally. Let's just say that this stuff is the result of many dedicated UNIX-sma

Re: Subversion Lifetime Achievement Award (was Re: GNU diff)

2011-02-07 Thread Philippe Bruhat (BooK)
On Sun, Feb 06, 2011 at 11:10:18AM +0100, Aristotle Pagaltzis wrote: > * Michael G Schwern [2011-02-06 06:45]: > > Here is your git undo button. > > > > [alias] > > undo = reset --hard HEAD^ > > Except for the `--hard`, which will throw away changes in the > only place where git cannot recove