From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dor Laor Subject: Re: Starting a VM reboots my machine Date: Tue, 06 Nov 2007 10:02:25 +0200 Message-ID: <47301F91.7000002@qumranet.com> References: <472A5561.5080202@cs.ualberta.ca> <64F9B87B6B770947A9F8391472E032160C95C59C@ehost011-8.exch011.intermedia.net> <20071104180538.GA6841@v2.random> <472F27BC.2060407@qumranet.com> <20071105151804.GB6841@v2.random> <472F35DD.7070905@qumranet.com> <20071105162836.GC6841@v2.random> <20071105171411.GD6841@v2.random> Reply-To: dor.laor-atKUWr5tajBWk0Htik3J/w@public.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: Alexey Eremenko , kvm-devel , Avi Kivity To: Andrea Arcangeli Return-path: In-Reply-To: <20071105171411.GD6841-lysg2Xt5kKMAvxtiuMwx3w@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Errors-To: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: kvm.vger.kernel.org Andrea Arcangeli wrote: > On Mon, Nov 05, 2007 at 05:28:36PM +0100, Andrea Arcangeli wrote: > >> Now I'm re-downloding the entire kvm.git and see if what I get is a >> different tree and if my previous kvm.git bitrotten. >> > > git bitrotten. What concerns me is that "git pull + git reset --hard" > can't bring my old kvm.git tree in sync with the newly downloaded one, > that diff I just posted remains between the two. I wonder ho to > translate "hg pull + hg update -C" in git terms, "git reset --hard" > clearly isn't good enough (or git isn't good enough in the first > place, one of the two). > > I'm not sure if it will fit you but you can do git reset --hard OLD_COMMIT_HASH using a commit hash in the past before any damaged merge point. Good luck. > ------------------------------------------------------------------------- > This SF.net email is sponsored by: Splunk Inc. > Still grepping through log files to find problems? Stop. > Now Search log events and configuration files using AJAX and a browser. > Download your FREE copy of Splunk now >> http://get.splunk.com/ > _______________________________________________ > kvm-devel mailing list > kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org > https://lists.sourceforge.net/lists/listinfo/kvm-devel > > ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/