From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Locks on the Bzr repository Date: Sun, 22 Aug 2010 07:47:16 -0400 Message-ID: References: <4C6D56DB.7040703@swipnet.se> <4C6D8EC5.7040901@swipnet.se> <4C6E1F0A.7070506@swipnet.se> <837hjlr78p.fsf@gnu.org> <87zkwhtws5.fsf@uwakimon.sk.tsukuba.ac.jp> <83tymppj62.fsf@gnu.org> <871v9t8klf.fsf@uwakimon.sk.tsukuba.ac.jp> <83lj81pazq.fsf@gnu.org> <83aaogpcbu.fsf@gnu.org> <87vd737pxd.fsf@uwakimon.sk.tsukuba.ac.jp> <83pqxboi38.fsf@gnu.org> <87r5hr6qvf.fsf@uwakimon.sk.tsukuba.ac.jp> <87hbin6m04.fsf@uwakimon.sk.tsukuba.ac.jp> <87fwy67vbn.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1282477648 3386 80.91.229.12 (22 Aug 2010 11:47:28 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 22 Aug 2010 11:47:28 +0000 (UTC) Cc: u.s.reddy@cs.bham.ac.uk, emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Aug 22 13:47:26 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.69) (envelope-from ) id 1On91K-0004Mz-8t for ged-emacs-devel@m.gmane.org; Sun, 22 Aug 2010 13:47:26 +0200 Original-Received: from localhost ([127.0.0.1]:38507 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1On91J-0005GR-M4 for ged-emacs-devel@m.gmane.org; Sun, 22 Aug 2010 07:47:25 -0400 Original-Received: from [199.232.76.173] (port=40653 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1On91E-0005GK-JM for emacs-devel@gnu.org; Sun, 22 Aug 2010 07:47:20 -0400 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1On91D-0005je-Ip for emacs-devel@gnu.org; Sun, 22 Aug 2010 07:47:20 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]:56363) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1On91D-0005jZ-C4 for emacs-devel@gnu.org; Sun, 22 Aug 2010 07:47:19 -0400 Original-Received: from eliz by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1On91A-0001wZ-Gz; Sun, 22 Aug 2010 07:47:16 -0400 In-reply-to: <87fwy67vbn.fsf@uwakimon.sk.tsukuba.ac.jp> (stephen@xemacs.org) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) 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:129027 Archived-At: > From: "Stephen J. Turnbull" > Cc: u.s.reddy@cs.bham.ac.uk, > emacs-devel@gnu.org > Date: Sun, 22 Aug 2010 20:14:52 +0900 > > > And there's the issue of conflicts when you resync next (unless the > > committed fix is textually identical to the one in your WT). > > I haven't noticed this being an issue. It was a massive pain in CVS, > but with git at least you revert the transaction causing conflicts and > either do a reverse cherry-pick or an interactive rebase on your tree. > Then redo the pull/merge/update. Usually not a big deal, even if it's > buried many commits deep in the DAG. Resolving such conflicts is not a big deal in bzr as well. It's just added overhead, that's all. People who don't have too much time try to avoid that.