X-Authentication-Warning: delorie.com: mail set sender to geda-user-bounces using -f
X-Recipient: geda-user AT delorie DOT com
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.98.4 at av02.lsn.net
Message-ID: <544EAFDD.1010200@ecosensory.com>
Date: Mon, 27 Oct 2014 15:49:33 -0500
From: John Griessen <john AT ecosensory DOT com>
User-Agent: Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Thunderbird/24.6.0
MIME-Version: 1.0
To: gEDA User List <geda-user AT delorie DOT com>
Subject: [geda-user] schdiff
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Reply-To: geda-user AT delorie DOT com

On 10/20/2014 12:06 AM, Abhijit Kshirsagar wrote:> In my lab we're
 > using git to track schematics, netlists and PCBs.
 > So far things are going well, although there are only 2-3
 > collaborators at most per project.
 > +1 for external VCS.
 > Diffs of gschem sch files are not very easy to read, but if (as John
 > Griessen suggests) the schematic is sorted it would be better.
 > Same for netlists.
 > However, IMO if the commits are well commented the diffs are easy
 > enough to understand.

So, it sounds like you're using gschem as is, without any post processing to sort
the .sch file, and a diff in a VCS is useful.  Are you using the idea of
collaborators working on places that do not overlap in parts or ICs or modules connected?
Do you see value even when people are working on parts and wires that
are "near" in netlist terms?

For schematics, schdiff is good* 99% of the
 > time. The only place it fails is a messy merge or rebase.