From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Git versus Bzr what is going on with emacs-24 branch? Date: Sat, 09 Feb 2013 14:02:19 +0100 Message-ID: References: <87licj98e4.fsf@gmail.com> <87han797o2.fsf@gmail.com> <87sj6rsn70.fsf@topper.koldfront.dk> <87mwvflqjx.fsf@wanadoo.es> <87fw16ljid.fsf@wanadoo.es> <877gmil8hr.fsf@wanadoo.es> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1360414952 3446 80.91.229.3 (9 Feb 2013 13:02:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 9 Feb 2013 13:02:32 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?utf-8?Q?=C3=93scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Feb 09 14:02:53 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1U4A4y-0003hD-W5 for ged-emacs-devel@m.gmane.org; Sat, 09 Feb 2013 14:02:53 +0100 Original-Received: from localhost ([::1]:35125 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U4A4f-00014i-VT for ged-emacs-devel@m.gmane.org; Sat, 09 Feb 2013 08:02:33 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:49655) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U4A4a-00014L-L7 for emacs-devel@gnu.org; Sat, 09 Feb 2013 08:02:32 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U4A4W-0004Ik-FO for emacs-devel@gnu.org; Sat, 09 Feb 2013 08:02:28 -0500 Original-Received: from mail-out.m-online.net ([2001:a60:0:28:0:1:25:1]:51293) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U4A4W-0004I9-9S for emacs-devel@gnu.org; Sat, 09 Feb 2013 08:02:24 -0500 Original-Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3Z3D1n6tbQz3hhw6; Sat, 9 Feb 2013 14:02:21 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3Z3D1n4xcNzbd17; Sat, 9 Feb 2013 14:02:21 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.180]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id U_8TEhnqfCuE; Sat, 9 Feb 2013 14:01:04 +0100 (CET) X-Auth-Info: a1qdCIWPvTquznmlEZQhmfzbWSKpwGbXjJORxApVkdQ= Original-Received: from igel.home (ppp-88-217-97-10.dynamic.mnet-online.de [88.217.97.10]) by mail.mnet-online.de (Postfix) with ESMTPA; Sat, 9 Feb 2013 14:02:21 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 501) id B72F5CA2A1; Sat, 9 Feb 2013 14:02:20 +0100 (CET) X-Yow: A can of ASPARAGUS, 73 pigeons, some LIVE ammo, and a FROZEN DAQUIRI!! In-Reply-To: <877gmil8hr.fsf@wanadoo.es> (=?utf-8?Q?=22=C3=93scar?= Fuentes"'s message of "Fri, 08 Feb 2013 23:57:04 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2.93 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 2001:a60:0:28:0:1:25:1 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:156919 Archived-At: This is the script I'm using. Andreas. #!/bin/bash test last-sync-start -nt last-sync-ready || touch -r last-sync-start last-sync touch last-sync-start rsync -av --del --exclude=obsolete_packs bzr.sv.gnu.org::bzr/emacs/ emacs.bzr/ || exit old=$(wc -l < marks/git-marks) cd emacs.git git fetch state=$(git show-ref) cd ../emacs.bzr heads= while read r; do b=${r%/.bzr/*} bb=$b test $b = master && bb=bzr/master test $b = emacs-23/emacs-23.2 && continue heads+=" refs/heads/$bb" git --git-dir=../emacs.git show-ref -q --verify refs/heads/$bb && test $r -ot ../last-sync && continue echo $b bzr fast-export --plain --marks=../marks/bzr-marks -b $bb $b | ( cd ../emacs.git git fast-import --force --quiet --export-marks=../marks/git-marks --import-marks=../marks/git-marks ) done < <(find . -path "*/.bzr/branch/last-revision" -printf "%P\n" | sort) touch ../last-sync-ready cd ../emacs.git git show-ref --heads | while read rev head; do test $head = refs/heads/master && continue case " $heads " in *" $head "*) r=$(echo "$state" | awk -v head=$head '$2 == head { print $1 }') if test -n "$r" && test "$(git merge-base $r $head)" != $r; then git tag lost+found/$r $r fi ;; *) git update-ref -d $head if test -z "$(git branch --contains $rev)"; then git tag lost+found/$rev $rev fi ;; esac done -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."