[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
Re: gEDA-user: getting used to git (almost trivial pcb patch)
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)
$ git commit -a
$ git format-patch -1
The last command got me a file named "0001-replaces-...-org.patch"
whose
contents I attached below. Is this the way patches should be
submitted?
Something went goofy with your patch.
It might have been with how it was attached to the mail.
It might also be that 6f0416253ccd is not a known revision in the
master repository.....
Here is how I make git patches.
I come up with some crazy idea!
I make a topic branch, if it is a stand alone idea i branch off of
origin/master
git checkout -b myCrazyIdea
This makes a new branch and checks it out into your working copy.
make changes
commit changes
work. work. work. test. test. test
if i have a lot of patches (and didn't publish the branch) I might
then do an interactive rebase to
- clean up the patch set
- squashing oops forgot this commits
- hiding my mistakes
- making it apply logically
- make concise commit messages
then I make my patches.
do a git fetch to make sure I am based off of the latest head.
git fetch
if there are changes, and you have kept your branch private, rebase
the branch onto origin/master and verify that no changes were
introduced that would break your patches.
Then when your all up to date.
mkdir patches
git format-patch -o patches origin/master
Throws the patches into the patches directory
Then I attach them to the email, as files, not as text so that they
are protected with MIME encoding.
-- method two -- If your going to do a LOT of work. It seems this is
more for developers and junior developers.
If you want to set up a git repository on a site like git-hub, you
then publish your crazy idea branch.
Be nice and don't rebase your public branches, it's a pain to your
followers.
Then make a pull request to the developers.
The developer would then add your public git repo as a remote, fetch
it, and then can do a git merge on the branch into their copy, then
push to git.gpleda.org
Then when you fetch/pull from git.gpleda.org, your repo will go OH!
look there are my patches..... They have been merged!
I avoid the use of reset most of the time..... it's a sledge hammer
for fix small errors, not a work-flow tool, IMHO since it can delete
data in the working copy. I learned that the hard way by following
some uber hackers instructions and did a hard reset when I needed a
mixed and forced it and lost a days efforts.
---<(kaimartin)>---
Kai-Martin Knaak
Öffentlicher PGP-Schlüssel:
http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x6C0B9F53
-------------------------------------------------------------------
From 6f0416253ccd6065c04b520b9add89e166b0a718 Mon Sep 17 00:00:00 2001
From: Kai-Martin Knaak <kmk@xxxxxxxxxxxx>
Date: Sat, 13 Mar 2010 17:52:09 +0100
Subject: [PATCH] replaces "pcb.sourceforge.net" with "pcb.gpleda.org"
---
README | 5 ++---
doc/pcb.texi | 5 ++---
src/main.c | 2 +-
win32/Readme.txt | 3 +--
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/README b/README
index be006fd..9b9da9a 100644
--- a/README
+++ b/README
@@ -6,9 +6,8 @@ For additional information read the manual (doc/
pcb.pdf)
If you are updating you may wish to read the ChangeLog
-There is also a bug tracking system and user forum available
-on the sourceforge project page which can be found from
-http://pcb.sourceforge.net.
+There is also a bug tracking system available which can
+be found from http://pcb.gpleda.org.
-------------------------------------------------------------------------
diff --git a/doc/pcb.texi b/doc/pcb.texi
index b1adb89..2eeaeb0 100644
--- a/doc/pcb.texi
+++ b/doc/pcb.texi
@@ -5274,9 +5274,8 @@ Centroid (X-Y) data for driving automated
assembly equipment.
@cindex xcircuit, how to interface with
If anyone cares to contribute this section, it will get added. Please
-submit changes to the bug tracking system at the sourceforge project
-page for PCB which can be found from the PCB homepage at
-@url{http://pcb.sourceforge.net}.
+submit changes to the bug tracking system for PCB which can be
found from
+the PCB homepage at @url{http://pcb.gpleda.org}.
@c --------------------------- Appendix A
-------------------------------
diff --git a/src/main.c b/src/main.c
index a0b38f3..b25093e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -246,7 +246,7 @@ usage (void)
n_exporter++;
}
- u ("PCB Printed Circuit Board editing program, http://pcb.sourceforge.net
");
+ u ("PCB Printed Circuit Board editing program, http://pcb.gpleda.org
");
u ("%s [-h|-V|--copyright]\t\t\tHelp, version, copyright",
Progname);
u ("%s [gui options] <pcb file>\t\tto edit", Progname);
u ("Available GUI hid%s:", n_gui == 1 ? "" : "s");
diff --git a/win32/Readme.txt b/win32/Readme.txt
index 7d73a68..93273a4 100644
--- a/win32/Readme.txt
+++ b/win32/Readme.txt
@@ -4,8 +4,7 @@
This is the windows port of the pcb printed circuit board
layout editor.
-Please visit http://pcb.sourceforge.net for more information
-about PCB.
+Please visit http://pcb.gpleda.org for more information about PCB.
The windows port makes use of GTK+ for windows. Please visit
http://www.gtk.org for more information about GTK. Without all the
hard
--
1.6.5
_______________________________________________
geda-user mailing list
geda-user@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-user
_______________________________________________
geda-user mailing list
geda-user@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-user