Mail Archives: geda-user/2012/12/21/18:21:51
On Fri, Dec 21, 2012 at 10:19:22PM +0000, Peter Clifton wrote:
> On Fri, 2012-12-21 at 18:39 +0100, Gabriel Paubert wrote:
> > On Fri, Dec 21, 2012 at 02:32:19PM +0000, Peter Clifton wrote:
> > > On Thu, 2012-12-20 at 13:21 +0100, Gabriel Paubert wrote:
> > >
> > > > I can believe it. I really considered your previous patch a regression,
> > > > but color differentiation is going forward.
> > >
> > > Did you get a chance to try it out yet?
> >
> > I was just trying but had a problem. Cloning the repository worked but:
> >
> > git checkout for_master origin/for_master
> >
> > as you said in a previous message failed!
>
> What was the error message?
error: pathspec 'for_master' did not match any file(s) known to git.
error: pathspec 'origin/for_master' did not match any file(s) known to git.
>
> What branches are listed with
>
> git branch
* pcb+gl
>
> and
>
> git branch -r
origin/HEAD -> origin/pcb+gl
origin/abstract_graphics_api
origin/abstract_graphics_api.stgit
origin/acy_resistor_model
origin/anti-polygons
origin/anti-polygons.stgit
origin/bentley_ottmann_intersect
origin/bentley_ottmann_intersect.stgit
origin/butcher_crosshair
origin/butcher_crosshair.old
origin/butcher_crosshair.stgit
origin/draw_api_idea
origin/draw_api_idea.stgit
origin/exporter_idea
origin/exporter_idea.stgit
origin/for_bdale
origin/for_bdale.stgit
origin/for_master
origin/for_master.stgit
origin/gerber_import
origin/gerber_import.stgit
origin/glist
origin/glist.stgit
origin/layer_selector
origin/layer_selector.stgit
origin/lesstif_gl
origin/lesstif_gl.stgit
origin/local_customisation_pcb+gl
origin/local_customisation_pcb+gl.stgit
origin/local_customisation_pours
origin/local_customisation_pours.stgit
origin/old_idea
origin/old_idea.stgit
origin/pcb+gl
origin/pcb+gl.stgit
origin/pcb+gl_experimental
origin/pcb+gl_experimental.stgit
origin/polygon_speedup
origin/polygon_speedup.stgit
origin/pours
origin/pours.stgit
origin/pours_with_anti_polygons
origin/pours_with_anti_polygons.stgit
origin/private_views
origin/private_views.stgit
origin/thermal-geometry
origin/thermal-geometry.stgit
I'm using git 1.7.10.4, the one from Debian testing updated about 1 month
ago. Apparently I could simply type git checkout origin/for_master.
>
> > I first tried to navigate the repository with "gitk --all" and got
> > lost: too many rebases.
>
> --all is confusing for repositories using stgit, as there is a lot of
> churn in the .stgit branches.
>
> I use a shell script I call "gitkall", contaning:
>
> gitk $(git show-ref | grep -v ".stgit" | grep -v "patches/") $@
>
> That filters out the stgit stuff.
>
>
> > However, the result of the clone includes the relevant patch
> > (the RATFOUND one), so I compiled and installed it.
>
> You might have one of my own branches then... it probably contains a lot
> of other cruft which you won't want, including changes to mouse wheel
> bindings, experimental GL rendering etc..
Maybe, but it does not seem to affect the outcome. Actually
checking out "origin" and diffing with "origin/for_master" gives:
41 files changed, 7430 insertions(+), 522 deletions(-)
from diffstat.
> Nice.. I'll have to make it a little bit more configurable, and figure
> out whether the "FOUND" flag should be applied to every object, or just
> the connected ones..., then I can push it.
I believe that it should be applied to every object.
Regards,
Gabriel
- Raw text -