From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juanma Barranquero Newsgroups: gmane.emacs.devel Subject: Re: bzr handholding: restoring deleted file Date: Fri, 8 Jan 2010 11:42:30 +0100 Message-ID: References: <20100108004050.GB1426@fencepost.localnet> <19270.33137.43277.502551@fencepost.gnu.org> <83iqbdaqzl.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1262947492 6291 80.91.229.12 (8 Jan 2010 10:44:52 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 8 Jan 2010 10:44:52 +0000 (UTC) Cc: maarons@gnu.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 08 11:44:45 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 1NTCKi-0002Gq-Ke for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 11:44:44 +0100 Original-Received: from localhost ([127.0.0.1]:54227 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTCKj-0004pd-7U for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 05:44:45 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NTCJ8-0003V1-TK for emacs-devel@gnu.org; Fri, 08 Jan 2010 05:43:07 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NTCJ4-0003Q8-U7 for emacs-devel@gnu.org; Fri, 08 Jan 2010 05:43:06 -0500 Original-Received: from [199.232.76.173] (port=58299 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTCJ4-0003Pr-96 for emacs-devel@gnu.org; Fri, 08 Jan 2010 05:43:02 -0500 Original-Received: from mail-bw0-f215.google.com ([209.85.218.215]:50441) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NTCIv-0007sZ-Ih; Fri, 08 Jan 2010 05:42:53 -0500 Original-Received: by bwz7 with SMTP id 7so13243644bwz.26 for ; Fri, 08 Jan 2010 02:42:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :from:date:message-id:subject:to:cc:content-type :content-transfer-encoding; bh=174u6x2ErZjl1YsVPfGJrW0lSz63cO38zour0NSM3I8=; b=DyFTQlVmJ3Ry1AgDEGy668sHiR0s6c1lHnedjaTGzqoUwgRQ2rVAF1aBMn3cPyIJbB TkuLhbs9poA/fu+6qmtghoLI5yaDocF+MuI7xd/nMTcZiYCldTUszxPZM5XcTMOpLACs 8lPu6qA4G8AGezN3IHzhtz3cY84aPJFyw+DBE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; b=nU1Y1SpSXEVAbXO0KHHnymlQPVafvX3prGZnhFGWOGm0XLBBBSL3Bl2l3tz4NUSl3E XrJtxLrv9sdvRvxce3Z/V3L9tjsZWg53Akb176weznfKv0bsXj5DW1sEYAUb1LKsoC0V gTly2HIsxpWRE+vnSc3Cz9Me3p3Dpwf2mgrbQ= Original-Received: by 10.204.2.205 with SMTP id 13mr1470167bkk.158.1262947371223; Fri, 08 Jan 2010 02:42:51 -0800 (PST) In-Reply-To: <83iqbdaqzl.fsf@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:119667 Archived-At: On Fri, Jan 8, 2010 at 10:24, Eli Zaretskii wrote: > Btw, can anyone explain what does "merge --uncommitted" do? =C2=A0Its > description in the docs is cryptic: > > =C2=A0--uncommitted =C2=A0 =C2=A0Apply uncommitted changes from a working= copy, instead > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 of branch = changes. After cd trunk bzr merge --uncommitted ../my-branch the trunk's tree will have the changes that were (and still are) in my-branch's tree. It's a way to copy uncommitted changes between trees, instead of the normal merge, which copies committed changes between branches. Juanma