Re: CM 1.1 git question

[Trevor Daniels]

Jonathan, you wrote Thursday, February 19, 2009 12:16 PM


> Trevor Daniels wrote:
> > Jon, the recent patch I pushed for you (lsr-work.patch) was
> > sent using Thunderbird but, as it was attached, the line
> > endings were correctly Unix (LF only).  It did have white
> > space at the end of most (every, maybe) lines, but this is
> > easily fixed - I routinely check and remove white space
> > anyway.
> >
> > The patch itself didn't apply directly due to your earlier
> > practice of doing your editing outside git - my git has
> > no knowledge of one of the files used in the comparison,
> > so it refused to apply it.  As it was a simple patch it
> > was easily pasted in, so no problem.
> >
> > Incidentally, the precise line endings are not significant
> > if you send them to someone who uses git under Windows (me),
> > as git under Windows silently converts all line endings to
> > Unix during the commit (if necessary) by default.
> >
> > Trevor
>
> Are you talking about the patch where you had to fix the @qq{} 
> thing I forgot to do?

Yes

> If so, could you also check the patch I attached to an email in 
> this thread at 12:37 p.m. Central Time yesterday?  I made that one 
> using git and I'd like confirmation that it has all the formatting 
> you guys expect.  It was made to fix a typo, "lastest" to 
> "latest".

This still seems to have whitespace at the end of the
changed line which you added.  But I guess you made this
before Carl confirmed how to fix this.

More seriously, the patch doesn't apply here because
your line numbering seems to be 1 off from the line
numbers I have in git-starting.itexi.  I have no idea
why that should be.  I believe my git repo is fully
synch'ed with origin/master, and according to your
description of the method you used to create the patch
yours should be too.  The line you are changing is
numbered 229, not 230, in my copy.

Have another go, and this time mail me as well the full
committish of the repo immediately after you merge
in origin/master and before you make the change.  Then
I have the exact point in the repo where the change
was made.  You can get the committish with the command
git log -n1

Trevor