From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Stephen J. Turnbull" Newsgroups: gmane.emacs.devel Subject: Re: Help me unstick my bzr, please. Date: Sat, 16 Jan 2010 17:29:30 +0900 Message-ID: <87wrzio3kl.fsf@uwakimon.sk.tsukuba.ac.jp> References: <20100115222724.GB1931@muc.de> <87r5pqkc63.fsf@kobe.laptop> <83k4vicwws.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1263630099 23119 80.91.229.12 (16 Jan 2010 08:21:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 16 Jan 2010 08:21:39 +0000 (UTC) Cc: Giorgos Keramidas , acm@muc.de, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jan 16 09:21:31 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 1NW3uV-0003ew-66 for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 09:21:31 +0100 Original-Received: from localhost ([127.0.0.1]:34394 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NW3uV-0006Gj-Rp for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 03:21:31 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NW3uP-0006GU-Pj for emacs-devel@gnu.org; Sat, 16 Jan 2010 03:21:25 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NW3uK-0006FE-5i for emacs-devel@gnu.org; Sat, 16 Jan 2010 03:21:24 -0500 Original-Received: from [199.232.76.173] (port=53651 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NW3uK-0006FB-0m for emacs-devel@gnu.org; Sat, 16 Jan 2010 03:21:20 -0500 Original-Received: from mx20.gnu.org ([199.232.41.8]:65305) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NW3uG-0000dy-1T; Sat, 16 Jan 2010 03:21:16 -0500 Original-Received: from mtps01.sk.tsukuba.ac.jp ([130.158.97.223]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NW3uF-0001Hn-4o; Sat, 16 Jan 2010 03:21:15 -0500 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) by mtps01.sk.tsukuba.ac.jp (Postfix) with ESMTP id 9427E1537B3; Sat, 16 Jan 2010 17:21:13 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id E5DCF1A2A92; Sat, 16 Jan 2010 17:29:30 +0900 (JST) In-Reply-To: <83k4vicwws.fsf@gnu.org> X-Mailer: VM 8.0.12-devo-585 under 21.5 (beta29) "garbanzo" a03421eb562b XEmacs Lucid (x86_64-unknown-linux) X-detected-operating-system: by mx20.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) 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:120093 Archived-At: Eli Zaretskii writes: > Why not simply > > ~/emacs/emacs.bzr/quickfixes$ bzr merge --force > > ? Then Alan could continue with the normal quickfixes workflow: Because IIUC the situation correctly, Alan's work would show up as a merge commit, not as a commit to a branch. IOW, in the logs (or a graphical DAG viewer) it would look like he was resolving conflicts in the merge of those commits, not committing new work. For tiny changes this is a pretty pedantic distinction, and for humans the log message would probably make what happened clear. For larger changes, this could cause problems (ie, less accurate localization of the responsible change) using tools like bisect; I'd have to think about it.