X-Authentication-Warning: delorie.com: mail set sender to geda-user-bounces using -f
X-Recipient: geda-user AT delorie DOT com
Message-ID: <20150318165331.25228.qmail@stuge.se>
Date: Wed, 18 Mar 2015 17:53:31 +0100
From: Peter Stuge <peter AT stuge DOT se>
To: geda-user AT delorie DOT com
Subject: Re: [geda-user] pcb alternatives
Mail-Followup-To: geda-user AT delorie DOT com
References: <CAHLh21Cdm=YZuqCQ+gCHSviJquahr6cnAQ-VBLR4BSs-nfHOig AT mail DOT gmail DOT com> <CAOFvGD4+4bHXNYLvePi70wb_1A4=dQgb_Ov3xBghoKbXQUsSGA AT mail DOT gmail DOT com> <5508413E DOT 4000405 AT ecosensory DOT com> <46050a0c DOT 619 DOT 14c2850d052 DOT Webtop DOT 45 AT optonline DOT net> <CAGYR9veihi_M+B0HXptGYQLMO8=B_KOLM2wmrRNkMLG_9MdQrA AT mail DOT gmail DOT com> <alpine DOT DEB DOT 2 DOT 00 DOT 1503180357520 DOT 25799 AT igor2priv> <CAGYR9ve_n7VmZ8x-jCQK5eKHMNGp6an9o8EwYZnWQWFiCpGnXg AT mail DOT gmail DOT com> <alpine DOT DEB DOT 2 DOT 00 DOT 1503180827170 DOT 25799 AT igor2priv> <CAC4O8c--CeEiKjxCKrs38XGjOyPS0Cy6scZ5HsAFgpi5xDpP_w AT mail DOT gmail DOT com> <201503181619 DOT t2IGJkZD012945 AT envy DOT delorie DOT com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201503181619.t2IGJkZD012945@envy.delorie.com>
Reply-To: geda-user AT delorie DOT com
Errors-To: nobody AT delorie DOT com
X-Mailing-List: geda-user AT delorie DOT com
X-Unsubscribes-To: listserv AT delorie DOT com
Precedence: bulk

DJ Delorie wrote:
> > Our of curiousity, what have you got against it?  Have you tried it?
> > Its an order of magnitude better than cvs/svn.
> 
> I have to use git at work, as well as managing the geda git repo.  It
> seems that no matter what "simple" operation I do, it fights me at
> every step.

My experience is that technical difficulties with Git usually relate
to an incomplete mental model of how Git operates, perhaps compounded
with expectations about how it surely must fit into already learned
workflows.

I think your life with Git at and outside work would be easier if you
decided to learn the (very small) Git data model, because it allows
thinking about git commands not in terms of "repeatable sequences"
but in terms of what operations they actually perform on the few
types of data that Git deals with. I'm happy to help if I can.


> I've had cases where my local repo got so confused that it was
> easier to delete the repo and start again than to try to figure
> out what happened to my patch.

Sure thing, the git command exposes lots of low-level operations
which can cause all sorts of problems, much like sudo rm -rf /
can cause all sorts of problems in a UNIX-like system.


> pretty much every big patch I've made has ended up with a ChangeLog conflict,

So don't create big commits. "Doctor, it hurts when I do this.."


> and conflict management is git's weak point.

I'd say it's about the same as all other popular VCSes, they all seem
to operate on source code line level.


> FYI the BIG reason why cvs is better for gedasymbols is it's the only
> one that lets you check out and manage a subdirectory of the repo.

Certainly! With Git, anything that should be available and/or managed
individually should rather have a repository of its own.


Kind regards

//Peter