X-Authentication-Warning: delorie.com: mail set sender to geda-user-bounces using -f
X-Recipient: geda-user AT delorie DOT com
X-Original-DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=mail.ud03.udmedia.de; h=
	message-id:date:from:mime-version:to:subject:content-type
	:content-transfer-encoding; s=beta; bh=a8juWJ0eMF4vZ5iRM5thXFuzu
	BHtAMUYaZIEsgBdqv4=; b=tqtWeDK2RKr1i8hRka5Rsb8+KiKJ0qdpqrnE6yBD+
	yFh+AXWioZlBxH9Ud+Gba2b/unPJXUylSAdxW/ub6iYiUXd+8eIggY15mAFd1aN5
	1eZSYNh3zICY0NnqoqS3RF9bQvbfg62upV4fx6bNPIhukyQrKdqde7NiQQcy8XXk
	Ag=
Message-ID: <55D8D8B8.7050907@jump-ing.de>
Date: Sat, 22 Aug 2015 22:16:56 +0200
From: "Markus Hitter (mah AT jump-ing DOT de) [via geda-user AT delorie DOT com]" <geda-user AT delorie DOT com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0
MIME-Version: 1.0
To: gEDA User <geda-user AT delorie DOT com>
Subject: [geda-user] Antifork
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Reply-To: geda-user AT delorie DOT com

Hello folks,

for years I had and still have the impression that there is no shortage of gEDA/pcb developers. Actually, many talented people happily hack away on the project. However, for some magic reason, none of them does so in the official repo. Virtually all of them create forks. No surprise, their stuff is close to invisible. Work gets duplicated. Bugs are never completed. You name it.

Enter antifork. I wrote a script which simply does the reverse. It pulls back all the branches in remote repositories into the official repo. ... wait ... not into the public official repo, yet, but your local clone of it. Forwarding such branches to the public repo is straightforward, simply do a 'git push origin <branch>'.

Usage is simple. Like every well written script it reports usage hints when run with the -h argument.

As it's not on the master branch, yet, it has to be grabbed:

  cd /path/to/pcb/repo
  git checkout whatever-branch-you-like
  git checkout LP1487761-antifork antifork/*

Then you can antifork:

  cd antifork
  ./antifork.sh -h
  ./antifork.sh

Suddenly you have all the remote branches right there in your repo browser. You can compare them, rebase them, add commits to bug reports, forward stuff to the public repo in a snap, actually resolving bugs.

Even cleaning is possible: if you found one of the forked branches to be obsolete, simply add the commit hash of the last commit to the repo description file in antifork/, along with a 'ignorebranch' in front of it. 'clifton' has an example already. Then these fork tracking branches will be removed/ignored on the next run of antifork.

What do you think? Good idea? I do hope collaboration picks up again.


Markus

-- 
- - - - - - - - - - - - - - - - - - -
Dipl. Ing. (FH) Markus Hitter
http://www.jump-ing.de/