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: Simple unsticking with 'bzr shelve' [was: Help me unstick ...] Date: Sun, 17 Jan 2010 15:23:47 +0900 Message-ID: <877hrhtfkc.fsf@uwakimon.sk.tsukuba.ac.jp> References: <20100115222724.GB1931@muc.de> <87r5pqkc63.fsf@kobe.laptop> <83k4vicwws.fsf@gnu.org> <83d41acr32.fsf@gnu.org> <837hricn8s.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 1263709032 23317 80.91.229.12 (17 Jan 2010 06:17:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 17 Jan 2010 06:17:12 +0000 (UTC) Cc: keramida@ceid.upatras.gr, acm@muc.de, Lennart Borgman , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jan 17 07:17:04 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 1NWOQR-0005Dg-Qt for ged-emacs-devel@m.gmane.org; Sun, 17 Jan 2010 07:15:52 +0100 Original-Received: from localhost ([127.0.0.1]:52339 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NWOQS-0008HU-H1 for ged-emacs-devel@m.gmane.org; Sun, 17 Jan 2010 01:15:52 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NWOQM-0008Ez-TK for emacs-devel@gnu.org; Sun, 17 Jan 2010 01:15:46 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NWOQI-0008B0-9d for emacs-devel@gnu.org; Sun, 17 Jan 2010 01:15:46 -0500 Original-Received: from [199.232.76.173] (port=40614 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NWOQI-0008Av-77 for emacs-devel@gnu.org; Sun, 17 Jan 2010 01:15:42 -0500 Original-Received: from mtps01.sk.tsukuba.ac.jp ([130.158.97.223]:60222) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NWOQG-00078x-FE; Sun, 17 Jan 2010 01:15:40 -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 CDFAC1537B3; Sun, 17 Jan 2010 15:15:36 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id 4E00D1A35F6; Sun, 17 Jan 2010 15:23:47 +0900 (JST) In-Reply-To: <837hricn8s.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 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:120136 Archived-At: Eli Zaretskii writes: > > Is that really true??? If so why does not bazaar protect against this? > > It's really easy to get out of this "bad state". No more complicated > than with CVS. The biggest problem with the bad state is that it is not obvious what to do about it. Documentation is needed. Actually (sorry for not remembering this earlier because it is TOOWTDI) ... Just use "bzr shelve". Suppose the files Alan changed are cc-foo.el and cc-bar.el, and nothing in the 55 files in the merge touched them. $ bzr shelve cc-foo.el cc-bar.el $ bzr resolve --all $ bzr update # may not be needed but shouldn't hurt should DTRT, and now Alan can do "bzr log -n0" and "bzr status" to check for sanity (yes, Alan, you *can* trust your intuition here), and if things look OK, $ bzr unshelve $ bzr commit -m "Killer feature added to CC Mode!" and push as appropriate for his branch layout. See "bzr help shelve" for details and caveats on use of the shelf.