From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Reitter Newsgroups: gmane.emacs.devel Subject: Re: Git mirror - bidrectional Date: Wed, 13 Jan 2010 11:15:22 -0500 Message-ID: <2159406C-36DD-4254-BE2A-E3EFCB32013B@gmail.com> References: <877hs6bavz.fsf@catnip.gol.com> <2ACCA862-B70E-4D57-AF88-B36E6DF62FE1@gmail.com> <50BB0D44-FCA5-40C1-BDF7-87D1EE77551D@raeburn.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 (Apple Message framework v1077) Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="Apple-Mail-63--523202581" Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1263399515 24749 80.91.229.12 (13 Jan 2010 16:18:35 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 13 Jan 2010 16:18:35 +0000 (UTC) Cc: "emacs-devel@gnu.org discussions" To: Ken Raeburn Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jan 13 17:18:27 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1NV5vD-0001y6-BH for ged-emacs-devel@m.gmane.org; Wed, 13 Jan 2010 17:18:15 +0100 Original-Received: from localhost ([127.0.0.1]:53682 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NV5vD-0007ZV-RW for ged-emacs-devel@m.gmane.org; Wed, 13 Jan 2010 11:18:15 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NV5sf-0006Rv-Bp for emacs-devel@gnu.org; Wed, 13 Jan 2010 11:15:37 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NV5sa-0006Mb-Ez for emacs-devel@gnu.org; Wed, 13 Jan 2010 11:15:36 -0500 Original-Received: from [199.232.76.173] (port=49018 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NV5sa-0006MO-9w for emacs-devel@gnu.org; Wed, 13 Jan 2010 11:15:32 -0500 Original-Received: from qw-out-1920.google.com ([74.125.92.149]:34402) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NV5sZ-0002RC-Vo for emacs-devel@gnu.org; Wed, 13 Jan 2010 11:15:32 -0500 Original-Received: by qw-out-1920.google.com with SMTP id 9so388515qwj.24 for ; Wed, 13 Jan 2010 08:15:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:mime-version :content-type:from:in-reply-to:date:cc:content-transfer-encoding :message-id:references:to:x-pgp-agent:x-mailer; bh=3N1i2ep7Lcdh1/2Bww4NUAUxD2xY2YnUJr3Cr/L4s2I=; b=NooVZCIsyyHvJlaI93DNc4wcZ0CaF1k6/MaLRdW+MHO4FZn0rG2Usrtf/ZFKAwMzFf +K5vFX4H/8eC8zMxd7nxHGZURNIy6hK8e9h1IRrhc5vw3KAZ023ZoGpDUKF7G4/Yij4N hZD7e+peeyevKBfplsTf/qLYcgHi4u8CMNAsU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:mime-version:content-type:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to:x-pgp-agent :x-mailer; b=p6yKserl3F/JOdrC4sMJyDZtqXShYro2nSzeobYj2YudaPdDInYZhCtawu+twVKcwM 6ysr9sNosuhNZoSdMSW0oGPPNNPq7Z1NZZAuyxuVDMVlMyYoqXKf1QCl6AN/LVNk9FqF Hf2Ho3LbHodSn9TrRo2K/RfoaXpTeVs20Pbn0= Original-Received: by 10.224.104.96 with SMTP id n32mr9696703qao.175.1263399331357; Wed, 13 Jan 2010 08:15:31 -0800 (PST) Original-Received: from cmu-365842.wv.cc.cmu.edu (CMU-365842.WV.CC.CMU.EDU [128.237.239.116]) by mx.google.com with ESMTPS id 5sm3235775qwg.8.2010.01.13.08.15.28 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 13 Jan 2010 08:15:29 -0800 (PST) In-Reply-To: <50BB0D44-FCA5-40C1-BDF7-87D1EE77551D@raeburn.org> X-Pgp-Agent: GPGMail 1.2.3 X-Mailer: Apple Mail (2.1077) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:119921 Archived-At: This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --Apple-Mail-63--523202581 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On Jan 13, 2010, at 10:12 AM, Ken Raeburn wrote: > On Jan 12, 2010, at 14:27, David Reitter wrote: >> Does anyone plan to set up facility to make the git mirror writeable = and merge changes into the Bzr branch? >> (Changes to ChangeLog files might lead to merge conflicts, but if = that is solved, a bidirectional Git bridge would really be quite = useful.) >=20 > Does git have sufficient hooks to push back submitted changes to bzr = in real time, and detect conflicts at that point, and report an error to = the client without updating the git mirror (aside from maybe some new = commits unreferenced by branch labels)? Looking at the documentation, I see that the "update" hook is designed = to do just that. When a remote repository does a push, the new = revisions are sent to the repository, but before the ref (i.e. branch = pointer) is updated, this hook is invoked. It can prevent the update to = the ref. If the hook fails this way, one could call the sync script to import the = latest changes from the bzr side so that the client can then pull/merge = those before attempting to push again. What happens when the changes that originated on the git side are = re-imported to the git repository? Would we get double revisions?=20 Also, would importing sidestep the new revisions on the git side because = the "marks" file points to an earlier previous revision? This would = mean that users would have to constantly "pull -f" and rebase, right? http://kernel.org/pub/software/scm/git-core/docs/githooks.html= --Apple-Mail-63--523202581 content-type: application/pgp-signature; x-mac-type=70674453; name=PGP.sig content-description: This is a digitally signed message part content-disposition: inline; filename=PGP.sig content-transfer-encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.12 (Darwin) iEYEARECAAYFAktN8Z8ACgkQYotoJUVQB4LK/QCfQvd5CADQfowasEbAEffZWWJ1 8QIAnjbKqk8IPUbd0q/22Ti0M04lez5i =Q0cD -----END PGP SIGNATURE----- --Apple-Mail-63--523202581--