Andrea Arcangeli wrote: > On Tue, Nov 06, 2007 at 11:16:16AM +0200, Avi Kivity wrote: > >> Andrea Arcangeli wrote: >> >>> On Mon, Nov 05, 2007 at 05:25:17PM +0200, Avi Kivity wrote: >>> >>> >>>> Well, I can't find anything like that it my tree. Maybe something's >>>> stale? >>>> >>>> >>> Could be, this is why I don't like git that much, with hg there would >>> be no way that we could be looking at different trees. Anyway I agree >>> it's mandatory for merging with Linus so... >>> >>> I started with "git clone >>> git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git" some time >>> >>> >> btw, the easiest way to keep sync like that is 'git fetch origin'. That >> gives you a branch 'origin/master' that is equivalent to the state of >> kvm.git's master at the time of the fetch. >> > > I kept the bitrotten tree for tests like this, and specifying an older > commit to reset --hard fixed the problem, the above probably would > have worked too, thanks for the tips. Still I wonder how it went out > of sync. >
Perhaps I did a non-fast-forward update (I try not to do these, but sometimes yield to temptation) and your pull merged kvm.git with an old version of itself. -- error compiling committee.c: too many arguments to function ------------------------------------------------------------------------- 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 [email protected] https://lists.sourceforge.net/lists/listinfo/kvm-devel
