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: Re: Bazaar migration status? Date: Thu, 23 Jul 2009 12:49:06 +0900 Message-ID: <871vo8vz2l.fsf@uwakimon.sk.tsukuba.ac.jp> References: <87skgvtatv.fsf@stupidchicken.com> <87vdlpi2t9.fsf@canonical.com> <87skgrj8z6.fsf@catnip.gol.com> <4F76137C-0F9C-4181-8C02-F47C0180A9E3@raeburn.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1248321153 5500 80.91.229.12 (23 Jul 2009 03:52:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 23 Jul 2009 03:52:33 +0000 (UTC) Cc: Andreas Schwab , Emacs Development To: Ken Raeburn Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jul 23 05:52:26 2009 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 1MTpM0-0002yv-VN for ged-emacs-devel@m.gmane.org; Thu, 23 Jul 2009 05:52:25 +0200 Original-Received: from localhost ([127.0.0.1]:34465 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MTpM0-0003Kg-G5 for ged-emacs-devel@m.gmane.org; Wed, 22 Jul 2009 23:52:24 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MTpLv-0003Kb-ON for emacs-devel@gnu.org; Wed, 22 Jul 2009 23:52:19 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MTpLq-0003JS-Ly for emacs-devel@gnu.org; Wed, 22 Jul 2009 23:52:18 -0400 Original-Received: from [199.232.76.173] (port=40710 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MTpLq-0003JO-Ec for emacs-devel@gnu.org; Wed, 22 Jul 2009 23:52:14 -0400 Original-Received: from mtps02.sk.tsukuba.ac.jp ([130.158.97.224]:53241) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MTpLp-0006tp-Dx for emacs-devel@gnu.org; Wed, 22 Jul 2009 23:52:14 -0400 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) by mtps02.sk.tsukuba.ac.jp (Postfix) with ESMTP id 8451E8216; Thu, 23 Jul 2009 12:52:11 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id 58E5A1A3002; Thu, 23 Jul 2009 12:49:06 +0900 (JST) In-Reply-To: <4F76137C-0F9C-4181-8C02-F47C0180A9E3@raeburn.org> X-Mailer: VM 8.0.12-devo-585 under 21.5 (beta29) "garbanzo" 5bbff3553494 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:113033 Archived-At: Ken Raeburn writes: > The advice I've seen isn't "don't do it too often", it's "don't do > it". Rebase a copy of the branch instead of the original, if it worries you so much: git checkout -b rebased-branch original-branch git rebase master If you're worried about this, but have no control over the main repo, there's always # proof of concept; may fail spectacularly if you have defaults # configured git-my-pull () { git branch save-branch; git pull $@; } Advocacy: True, you will see "don't ever rebase" a lot from git-phobes. It should be considered to be a litmus test for git-phobia, not as reflecting VCS reality. In fact, rebasing is such an important operation that *all* of the dVCSes have been forced by user demand to provide it, and *only git* provides facilities (ie, the reflog) for recovery from an ill-advised rebase that can be used by newbies.[1] AFAIK, all of hg, bzr, and darcs can *destroy* some DAG data basically irrecoverably, while git *always* preserves it (until the next git-gc --prune, which by default is so far in the future that it's of the same order of magnitude as an Emacs release cycle ... uh, well, I exaggerate, but you get the point). Git-advocate-who-has-helped-advise-two-transitions-to-hg-ly y'rs, Footnotes: [1] Admittedly, untangling a git-rebase is not for wilting violet newbies, but anybody who has learned to accept dying in Nethack should be able to handle it -- it's exactly the same experience: you didn't want it to happen, it will take time and effort to get back to where you were, but no permanent harm is ever done.