Path: csiph.com!v102.xanadu-bbs.net!xanadu-bbs.net!eternal-september.org!feeder.eternal-september.org!feeds.phibee-telecom.net!newsfeed.xs4all.nl!newsfeed2a.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.004 X-Spam-Evidence: '*H*': 0.99; '*S*': 0.00; 'cpython': 0.05; 'paths': 0.07; 'versions.': 0.07; '*is*': 0.09; 'mercurial': 0.09; 'propagating': 0.09; 'cc:addr:python-list': 0.11; 'bug': 0.12; "wouldn't": 0.14; 'changes': 0.15; '-tkc': 0.16; '3.0.': 0.16; 'from:addr:python.list': 0.16; 'from:addr:tim.thechases.com': 0.16; 'from:name:tim chase': 0.16; 'mercurial,': 0.16; 'propagated': 0.16; 'propagation': 0.16; 'followed': 0.16; 'fix': 0.17; 'wrote:': 0.18; 'obviously': 0.18; 'cc:addr:python.org': 0.22; 'file.': 0.24; 'cc:2**0': 0.24; 'cc:no real name:2**0': 0.24; 'header:In-Reply-To:1': 0.27; 'went': 0.31; 'code': 0.31; 'file': 0.32; 'summary': 0.32; 'implemented': 0.33; 'older': 0.33; 'no,': 0.35; 'but': 0.35; 'version': 0.36; 'sequence': 0.36; 'charset:us-ascii': 0.36; 'two': 0.37; 'somebody': 0.38; 'rather': 0.38; 'expect': 0.39; "couldn't": 0.39; 'then,': 0.60; 'entire': 0.61; 'simple': 0.61; 'you.': 0.62; 'show': 0.63; 'different': 0.65; '(that': 0.65; 'between': 0.67; 'believe': 0.68; 'received:50.22': 0.84; 'subject:, ...': 0.84; 'imagine': 0.93 Date: Thu, 28 Aug 2014 11:32:40 -0500 From: Tim Chase To: Marko Rauhamaa Subject: Re: hg, git, fossil, ... In-Reply-To: <87oav4wpu0.fsf@elektro.pacujo.net> References: <57afe6cf-7cc4-4334-9f21-fdb8a6e70f30@googlegroups.com> <53FE22C7.3090806@stoneleaf.us> <87tx4xw3ye.fsf@elektro.pacujo.net> <87oav4wpu0.fsf@elektro.pacujo.net> X-Mailer: Claws Mail 3.8.1 (GTK+ 2.24.10; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - boston.accountservergroup.com X-AntiAbuse: Original Domain - python.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tim.thechases.com X-Get-Message-Sender-Via: boston.accountservergroup.com: authenticated_id: tim@thechases.com Cc: python-list@python.org 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: 29 NNTP-Posting-Host: 2001:888:2000:d::a6 X-Trace: 1409243660 news.xs4all.nl 2945 [2001:888:2000:d::a6]:56337 X-Complaints-To: abuse@xs4all.nl Xref: csiph.com comp.lang.python:77222 On 2014-08-28 19:17, Marko Rauhamaa wrote: > > I feel like I am misunderstanding you. My summary of what you > > just said is, "I have two scenarios where my code went through > > different sequences of changes to end up with the same content. > > I expect both of those paths will show the same history." That > > sounds nonsensical to me, so I must be misunderstanding you. The > > path the file followed (that is, the sequence of changes that > > made the file what it is), *is* the history of the file. > > Not the file but the repository. > > Imagine we have CPython 3.9. It might have an ancient > implementation of the deque. Then somebody realizes there's an > embarrassing bug that requires a simple fix in a C file. The fix is > implemented in HEAD. Then, it is propagated down to 3.9, 3.8, ... > 3.0. You obviously couldn't use "hg pull" for the propagation since > hg would insist on propagating all the unrelated features as well. 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). That would apply just that patch/diff to the older version rather than the entire history of changes between 3.{n<9} and 3.9 versions. -tkc