Re: gEDA-user: getting used to git (almost trivial pcb patch)

2010-03-16 Thread Bob Paddock
On Sat, Mar 13, 2010 at 11:31 PM, Dan McMahill wrote: > DJ Delorie wrote: >> >> I can't see why it complains, but...  maybe cr/lf or whitespace >> differences, which mail might have munged? > > the win32/Readme.txt file certainly is (and needs to remain) a DOS style > file.  It's a bit of a pain w

Re: gEDA-user: getting used to git (almost trivial pcb patch)

2010-03-16 Thread Kai-Martin Knaak
On Tue, 16 Mar 2010 11:54:38 -0400, DJ Delorie wrote: > Ok, the git version of git has the keep-cr patch, seems to work, pushed. > Thanks! Nice --> My first patch in geda/pcb! :-) I'll add a patch-for-newbies page to the wiki. ---<(kaimartin)>--- -- Kai-Martin Knaak

Re: gEDA-user: getting used to git (almost trivial pcb patch)

2010-03-16 Thread DJ Delorie
Ok, the git version of git has the keep-cr patch, seems to work, pushed. Thanks! ___ geda-user mailing list geda-user@moria.seul.org http://www.seul.org/cgi-bin/mailman/listinfo/geda-user

Re: gEDA-user: getting used to git (almost trivial pcb patch)

2010-03-16 Thread DJ Delorie
Turns out GIT can't handle importing patches with CRs properly :-P Google for "git am keep-cr" - patches to fix the bug are only a few weeks old. Still poking at it... ___ geda-user mailing list geda-user@moria.seul.org http://www.seul.org/cgi-bin/ma

Re: gEDA-user: getting used to git (almost trivial pcb patch)

2010-03-16 Thread Kai-Martin Knaak
On Mon, 15 Mar 2010 01:38:05 +0100, kai-martin knaak wrote: > DJ Delorie wrote: > > >> I can't see why it complains, but... maybe cr/lf or whitespace >> differences, which mail might have munged? > > This is a resend with the patch attached rather than appended to the > body. Hopefully, there

Re: gEDA-user: getting used to git (almost trivial pcb patch)

2010-03-14 Thread kai-martin knaak
DJ Delorie wrote: > > I can't see why it complains, but... maybe cr/lf or whitespace > differences, which mail might have munged? This is a resend with the patch attached rather than appended to the body. Hopefully, there is less munging this way. ---<(kaimartin)>--- -- Kai-Martin Knaak Öffen

Re: gEDA-user: getting used to git (almost trivial pcb patch)

2010-03-14 Thread Kai-Martin Knaak
On Sat, 13 Mar 2010 18:24:59 -0500, DJ Delorie wrote: > I can't see why it complains, but... maybe cr/lf or whitespace > differences, which mail might have munged? I sent the patch via gmane with my favorite usenet client pan. Maybe some munging was done down the road from gmane to the mailing

Re: gEDA-user: getting used to git (almost trivial pcb patch)

2010-03-13 Thread Dan McMahill
DJ Delorie wrote: I can't see why it complains, but... maybe cr/lf or whitespace differences, which mail might have munged? the win32/Readme.txt file certainly is (and needs to remain) a DOS style file. It's a bit of a pain with non-DOS aware vi's but this file's purpose in life is to show

Re: gEDA-user: getting used to git (almost trivial pcb patch)

2010-03-13 Thread Steven Michalske
On Mar 13, 2010, at 9:54 AM, Kai-Martin Knaak wrote: To familiarize myself with the patch production I did this almost trivial patch of the pcb source. It replaces the old URL at sourceforge.net with the new one at gpleda.org. $ git fetch $ git reset --hard origin/master $ ( do the edits) $ gi

Re: gEDA-user: getting used to git (almost trivial pcb patch)

2010-03-13 Thread DJ Delorie
I can't see why it complains, but... maybe cr/lf or whitespace differences, which mail might have munged? Also, I had to cut the patch out of your email, perhaps it assumes the patch *is* the mail, rather than being *in* the mail? $ git am -s /tmp/foo Applying: replaces "pcb.sourceforge.net" wi

gEDA-user: getting used to git (almost trivial pcb patch)

2010-03-13 Thread Kai-Martin Knaak
To familiarize myself with the patch production I did this almost trivial patch of the pcb source. It replaces the old URL at sourceforge.net with the new one at gpleda.org. $ git fetch $ git reset --hard origin/master $ ( do the edits) $ git commit -a $ git format-patch -1 The last command go