Path: csiph.com!v102.xanadu-bbs.net!xanadu-bbs.net!feeder.erje.net!eu.feeder.erje.net!newsfeed.xs4all.nl!newsfeed1.news.xs4all.nl!xs4all!newsgate.cistron.nl!newsgate.news.xs4all.nl!post.news.xs4all.nl!not-for-mail Return-Path: X-Original-To: python-list@python.org Delivered-To: python-list@mail.python.org X-Spam-Status: OK 0.043 X-Spam-Evidence: '*H*': 0.91; '*S*': 0.00; 'deprecated': 0.09; 'mercurial': 0.09; "wouldn't": 0.14; 'changes': 0.15; 'amend': 0.16; 'amended': 0.16; 'mercurial,': 0.16; 'wrote:': 0.18; 'bit': 0.19; 'later': 0.20; 'command': 0.22; 'merge': 0.24; 'file.': 0.24; 'header:In-Reply-To:1': 0.27; 'correct': 0.29; 'tim': 0.29; 'message-id:@mail.gmail.com': 0.30; '(since': 0.31; 'chase': 0.31; 'to:name:python-list': 0.33; 'could': 0.34; 'no,': 0.35; 'but': 0.35; 'received:google.com': 0.35; 'revert': 0.36; 'easily': 0.37; 'sometimes': 0.38; 'problems': 0.38; 'to:addr:python-list': 0.38; 'files': 0.38; 'rather': 0.38; 'ability': 0.39; 'skip:& 20': 0.39; 'to:addr:python.org': 0.39; 'august': 0.61; 'entire': 0.61; 'believe': 0.68; 'miss': 0.74; 'subject:, ...': 0.84 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=CsU4XPtL0odCVhr9duddAHJ+Ng1pSt1JEZ+MLB5/fEE=; b=o7iZn3/NiiExCFiPOPkAMECGjcyBMNcijnb8CYJtMesCs1RlaE561lnw/TlDf8uMKN vkyxM9sjRbtL2qrwj1GQngmSx5T2JBm3E2XnOuKrqkKrXFRvTlBor841w5Zse2B2VfQb 0rnvBO3TJAhldYvZM04/hnh34Xmwu+emOxb4mjoDAFRs0eJYlj3NtcWCPfgJOr+B+EQC dqUTTNbuGUsJ0k4kNvdew904yZfRXCxqbOSHOgCqODdA1O7S+XJQbILKzd6hzq5cjI+y xCuJYwaDJgM4UEDR6YFoAadsMEoxhB5hoyfJnYxZR+zCMB6rBrX3E0T2zPwNm1gg6nNL Cg3g== MIME-Version: 1.0 X-Received: by 10.182.19.135 with SMTP id f7mr6407989obe.40.1409261151990; Thu, 28 Aug 2014 14:25:51 -0700 (PDT) In-Reply-To: <20140828113240.71d4d63e@bigbox.christie.dr> References: <57afe6cf-7cc4-4334-9f21-fdb8a6e70f30@googlegroups.com> <53FE22C7.3090806@stoneleaf.us> <87tx4xw3ye.fsf@elektro.pacujo.net> <87oav4wpu0.fsf@elektro.pacujo.net> <20140828113240.71d4d63e@bigbox.christie.dr> Date: Fri, 29 Aug 2014 07:25:51 +1000 Subject: Re: hg, git, fossil, ... From: Tim Delaney To: Python-List Content-Type: multipart/alternative; boundary=001a11c299665c39300501b72e68 X-BeenThere: python-list@python.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: General discussion list for the Python programming language List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Newsgroups: comp.lang.python Message-ID: Lines: 51 NNTP-Posting-Host: 2001:888:2000:d::a6 X-Trace: 1409261647 news.xs4all.nl 2922 [2001:888:2000:d::a6]:54159 X-Complaints-To: abuse@xs4all.nl Xref: csiph.com comp.lang.python:77238 --001a11c299665c39300501b72e68 Content-Type: text/plain; charset=UTF-8 On 29 August 2014 02:32, Tim Chase wrote: > > No, you wouldn't use "hg pull" nor "git pull" but rather "git > cherry-pick" or what Mercurial calls "transplant" (I've not used this > in Mercurial, but I believe it's an extension). > hg transplant has been deprecated for a long time now. The correct command for cherry-picking is hg graft. I do sometimes miss the ability to easily cherry-pick the changes in a single file. When grafting, you graft the entire revision, and then need to revert individual files and amend the changeset if you don't want the graft as-is. It's a bit messy, and could cause problems if you later do a merge that includes the originally-grafted changeset on top of the amended changeset (since the changes committed to the amended changeset will be considered during the merge). Tim Delaney --001a11c299665c39300501b72e68 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
On 2= 9 August 2014 02:32, Tim Chase <python.list@tim.thechases.com<= /a>> wrote:

No, you wouldn't use "hg pull" nor "git pull"= but rather "git
cherry-pick" or what Mercurial calls "transplant" (I've = not used this
in Mercurial, but I believe it's an extension).
hg transplant has been deprecated for a long time now. The cor= rect command for cherry-picking is hg graft.

I do sometimes miss the ability to easily cherry-pick the changes in a sing= le file. When grafting, you graft the entire revision, and then need to rev= ert individual files and amend the changeset if you don't want the graf= t as-is. It's a bit messy, and could cause problems if you later do a m= erge that includes the originally-grafted changeset on top of the amended c= hangeset (since the changes committed to the amended changeset will be cons= idered during the merge).

Tim Delaney=C2=A0
--001a11c299665c39300501b72e68--