Re: gEDA-user: getting along with git

[Steven Michalske <smichalske@xxxxxxxxx>]

When you cloned Peters repository you are also getting his stacked git  
branches.
So I stopped getting them.

peter uses stacked git,  when you track the branches that he uses that  
on,  you get screwed up when he rewrites his history with stacked git.

If you are just following peter as ben said you'll have to git reset -- 
hard to fix that up.

What I do is make a new branch off of his work, cherry-pick my changes  
back into that new branch, and delete my old branch.

I find that basing my changes off of his before_pours branch is more  
stable.





Secondly, because peter pushes his stacked git branches to his github  
repo,  you'll most likely want to ignore them, especially if you like  
viewing all branches in a gui tool.

Change your .git/config remote section for his repo to something like  
this.

You will have to add remote branches manually,  unless you can specify  
branches to exclude....

[remote "pcjc2"]
     url = git://repo.or.cz/geda-pcb/pcjc2.git
     fetch = +refs/heads/before_pours:refs/remotes/pcjc2/before_pours
     fetch = +refs/heads/better_drc:refs/remotes/pcjc2/better_drc
     fetch = +refs/heads/master:refs/remotes/pcjc2/master
     fetch = +refs/heads/local_customisation:refs/remotes/pcjc2/ 
local_customisation
     fetch = +refs/heads/local_customisation_no_pours:refs/remotes/ 
pcjc2/local_customisation_no_pours

happy gitting :-)

On Apr 29, 2009, at 4:18 PM, Kai-Martin Knaak wrote:

> Just did one of my irregular updates of my local versions of geda  
> and pcb
> from git. For some reason "git pull" chokes on some  
> misconfiguration. I
> ended up recloning (again) and did a successful make.
>
> git pull complains similarly with geda and with pcb. So I guess, I do
> something stupid in my git work flow. This is, what I do to clone and
> make:
>
> /------
> git clone git://repo.or.cz/geda-pcb/pcjc2.git
> cd pcjc2
> git checkout -b before_pours origin/before_pours
> autogen.sh
> configure --disable-doc --enable-gl
> make
> sudo make install
> \------
>
> If I do "git pull" a few weeks later, I get errors like this:
>
> /-----------------------
> $ git pull
> remote: Counting objects: 5150, done.
> remote: Compressing objects: 100% (1887/1887), done.
> remote: Total 4948 (delta 3248), reused 4755 (delta 3060)
> Receiving objects: 100% (4948/4948), 974.63 KiB | 194 KiB/s, done.
> Resolving deltas: 100% (3248/3248), completed with 138 local objects.
> From git://repo.or.cz/geda-pcb/pcjc2
> + 69aab36...509a2c1 before_pours -> origin/before_pours  (forced  
> update)
> * [new branch]      better_drc -> origin/better_drc
> * [new branch]      better_drc.stgit -> origin/better_drc.stgit
> * [new branch]      better_drc_nogl -> origin/better_drc_nogl
> * [new branch]      better_drc_nogl.stgit -> origin/ 
> better_drc_nogl.stgit
> + dfb270f...e3bf179 local_customisation -> origin/local_customisation
> (forced update)
>   51554cc..75325d2  local_customisation.stgit -> origin/
> local_customisation.stgit
> + 4686c86...63a2d5a local_customisation_no_pours -> origin/
> local_customisation_no_pours  (forced update)
>   465c812..6f4afc1  local_customisation_no_pours.stgit -> origin/
> local_customisation_no_pours.stgit
> + 3b57798...9c7f393 master     -> origin/master  (forced update)
>   16efaa0..13701dc  master.stgit -> origin/master.stgit
> Auto-merging configure.ac
> Auto-merging src/Makefile.am
> Auto-merging src/draw.c
> CONFLICT (content): Merge conflict in src/draw.c
> Auto-merging src/find.c
> Auto-merging src/global.h
> Auto-merging src/hid.h
> Auto-merging src/hid/gtk/gtkhid-main.c
> CONFLICT (content): Merge conflict in src/hid/gtk/gtkhid-main.c
> Auto-merging src/hid/gtk/gui-output-events.c
> CONFLICT (content): Merge conflict in src/hid/gtk/gui-output-events.c
> Auto-merging src/hid/gtk/gui.h
> Auto-merging src/polygon.c
> Auto-merging src/polygon1.c
> CONFLICT (content): Merge conflict in src/polygon1.c
> Automatic merge failed; fix conflicts and then commit the result.
> \-----------------------------------
>
> Any hints?
>
> ---<(kaimartin)>---
>
>
>
> _______________________________________________
> 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