From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/81093 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.gnus.general Subject: Re: New branch for No Gnus Date: Wed, 01 Feb 2012 09:24:36 +0100 Organization: Probably a good idea Message-ID: References: <87bopnvezm.fsf@gnus.org> <87k44bh84h.fsf@dod.no> <87aa55cctr.fsf@gnus.org> <87aa54riih.fsf@dod.no> <87bopkc0dq.fsf@gnus.org> <87hazb26fm.fsf@dod.no> <87ty3b6c0d.fsf@gnus.org> <87y5snlnwz.fsf@FreeBSD.org> <87obtj4sqf.fsf@gnus.org> <878vknh9kq.fsf@dod.no> <87zkd31o9p.fsf@gnus.org> <87hazbl8ld.fsf@FreeBSD.org> <87mx93xsmv.fsf@gnus.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1328080923 14581 80.91.229.3 (1 Feb 2012 07:22:03 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 1 Feb 2012 07:22:03 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M29374@lists.math.uh.edu Wed Feb 01 08:22:03 2012 Return-path: Envelope-to: ding-account@gmane.org Original-Received: from util0.math.uh.edu ([129.7.128.18]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RsUW1-0000tO-U8 for ding-account@gmane.org; Wed, 01 Feb 2012 08:22:02 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by util0.math.uh.edu with smtp (Exim 4.63) (envelope-from ) id 1RsUVg-0001ra-Kg; Wed, 01 Feb 2012 01:21:40 -0600 Original-Received: from mx2.math.uh.edu ([129.7.128.33]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1RsUVf-0001rR-F8 for ding@lists.math.uh.edu; Wed, 01 Feb 2012 01:21:39 -0600 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx2.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1RsUVb-0003Zw-Ao for ding@lists.math.uh.edu; Wed, 01 Feb 2012 01:21:39 -0600 Original-Received: from plane.gmane.org ([80.91.229.3]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1RsUVZ-0005dh-U9 for ding@gnus.org; Wed, 01 Feb 2012 08:21:33 +0100 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1RsUVZ-0000dN-2v for ding@gnus.org; Wed, 01 Feb 2012 08:21:33 +0100 Original-Received: from 62.113.137.5 ([62.113.137.5]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 01 Feb 2012 08:21:32 +0100 Original-Received: from sb by 62.113.137.5 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 01 Feb 2012 08:21:32 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: ding@gnus.org Original-Lines: 27 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 62.113.137.5 Mail-Copies-To: never User-Agent: Gnus/5.110018 (No Gnus v0.18) Emacs/22.3 (gnu/linux) Cancel-Lock: sha1:g5o8hViaiwo++HAp74PW/DIa7C4= X-Spam-Score: -0.7 (/) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:81093 Archived-At: >>>>> Lars Ingebrigtsen : > Yeah, that was just for creating the branch and stuff. You should just > have to have done "cvs checkout no-gnus" to get the No Gnus branch. "git checkout no-gnus", perhaps...? :-) > Nothing further would have been necessary, I think? Correct. > Anyway, anybody know what's the best way to clean this up? Does git > have a total "rollback" feature? Oh yes! But it is somewhat dangerous (I have lost work this way): git checkout no-gnus git reset --hard sha1-of-last-commit-that-was-good git push -f origin HEAD (the last one, "push -f" after a reset, is somewhat rude if others have pulled in the meantime, and started adding commits to the stuff that you have reset. Should be used with utmost caution) > Or is it better to just apply reverse-patches to the No Gnus branch? Depends on what the branch was looking like after it was b0rked. But since it is fixed now, I guess you're good...?