From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jason Rumney Newsgroups: gmane.emacs.devel Subject: Re: bzr handholding: restoring deleted file Date: Fri, 08 Jan 2010 12:59:37 +0800 Message-ID: <4B46BBB9.2030900@gnu.org> References: <20100108004050.GB1426@fencepost.localnet> <19270.33137.43277.502551@fencepost.gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1262926842 18384 80.91.229.12 (8 Jan 2010 05:00:42 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 8 Jan 2010 05:00:42 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 08 06:00:34 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 1NT6xe-0006B2-I1 for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 06:00:34 +0100 Original-Received: from localhost ([127.0.0.1]:42228 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NT6xe-0001vm-UZ for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 00:00:34 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NT6xa-0001vh-Jy for emacs-devel@gnu.org; Fri, 08 Jan 2010 00:00:30 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NT6xV-0001vV-SD for emacs-devel@gnu.org; Fri, 08 Jan 2010 00:00:29 -0500 Original-Received: from [199.232.76.173] (port=57114 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NT6xV-0001vS-MO for emacs-devel@gnu.org; Fri, 08 Jan 2010 00:00:25 -0500 Original-Received: from mail-yw0-f177.google.com ([209.85.211.177]:33715) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NT6xV-0003HD-Bg for emacs-devel@gnu.org; Fri, 08 Jan 2010 00:00:25 -0500 Original-Received: by ywh7 with SMTP id 7so10704605ywh.24 for ; Thu, 07 Jan 2010 21:00:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :user-agent:mime-version:to:subject:references:in-reply-to :content-type:content-transfer-encoding; bh=CuLqaUd3zrrmkbOxO+rJzB/wWiJwlPDOhvtvRrw6XCw=; b=E7PeRAxXaOnOZhKz56fJFfnKOWD5Pk7GS1JVsNaFdK5xerPcuRjPNsAFjwKKEltaxY onvbL3u102uRel4fheCgVqbYmwExNOPcycAl5F8VILANtSUjqTUu4vQxOviQYss63nBW 8oVGCTpGN9WNGK/QKn4M5zV4Vnum4xWAwFtVY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:to:subject :references:in-reply-to:content-type:content-transfer-encoding; b=OhDwA8oqEqsP/aTg0K38kJRQhoUDFgNMjAC6dZ+xCTL3tkGckeN+WIbBQ5mHnJrEZi 8VXiSoogPwyqhR50ycZ9tzYWXQzRkrUJ7cpCRV8EwM/VdjWu4xhbX4kiKjNiGfrao8Ro uTmQnbUpZRHHfkpXNXR2fDvKaQW+pC/LZ1Fmo= Original-Received: by 10.150.19.21 with SMTP id 21mr10060634ybs.291.1262926823663; Thu, 07 Jan 2010 21:00:23 -0800 (PST) Original-Received: from ?10.1.1.113? ([61.4.103.130]) by mx.google.com with ESMTPS id 4sm7846148ywi.42.2010.01.07.21.00.20 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 07 Jan 2010 21:00:21 -0800 (PST) User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.1.5) Gecko/20091204 Thunderbird/3.0 In-Reply-To: <19270.33137.43277.502551@fencepost.gnu.org> 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:119644 Archived-At: On 08/01/2010 08:50, Glenn Morris wrote: > What command can I type to get the equivalent functionality of > `cvs update'? In other words, I want to: > Yes, this is the biggest hurdle I have come across too. This very basic function of a vcs seems unneccessarily complex in the workflow proposed. I have to: cd emacs/trunk bzr update cd ../quickfixes bzr commit bzr merge ... resolve conflicts bzr commit ... continue working Compared with the CVS case: cvs update ...resolve conflicts ...continue working