From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Wed, 25 Mar 2015 11:20:47 -0700 Organization: UCLA Computer Science Department Message-ID: <5512FC7F.90104@cs.ucla.edu> References: <5511998E.8080309@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1427307809 30088 80.91.229.3 (25 Mar 2015 18:23:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 25 Mar 2015 18:23:29 +0000 (UTC) Cc: emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Mar 25 19:23:20 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YapxV-0007jv-OJ for ged-emacs-devel@m.gmane.org; Wed, 25 Mar 2015 19:23:17 +0100 Original-Received: from localhost ([::1]:40735 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YapxV-0001LF-2E for ged-emacs-devel@m.gmane.org; Wed, 25 Mar 2015 14:23:17 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42127) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YapvH-00057v-AD for emacs-devel@gnu.org; Wed, 25 Mar 2015 14:21:00 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YapvD-0003dR-QM for emacs-devel@gnu.org; Wed, 25 Mar 2015 14:20:59 -0400 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:39249) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YapvD-0003bq-Is; Wed, 25 Mar 2015 14:20:55 -0400 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 6AAF2A60001; Wed, 25 Mar 2015 11:20:48 -0700 (PDT) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Original-Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MRXRbcdOT6bd; Wed, 25 Mar 2015 11:20:48 -0700 (PDT) Original-Received: from Penguin.CS.UCLA.EDU (Penguin.CS.UCLA.EDU [131.179.64.200]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 0505839E801A; Wed, 25 Mar 2015 11:20:48 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 131.179.128.62 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:184251 Archived-At: On 03/25/2015 07:43 AM, Richard Stallman wrote: > something is wrong in my repository with > lisp/ChangeLog. I have changes I want to check in, and I don't know > what to do. Brief hints are not enough to enable me to fix this. > How should I get my changes installed? > > Would you please help me? Here's a method that should work. It's slow and painstaking but each step should be easy to follow, which is the main thing. * Decide the changes that you want and record them, e.g., by putting them into a file 'wanted.diff': git diff >wanted.diff * Apparently your copy of the master branch is busted, so rename it to something else so that it's out of the way: git branch -m master master-busted * Create a new branch 'master' that tracks the origin: git branch --track master origin/master * Check it out, discarding all your local changes (be careful here! the local changes should all be in 'wanted.diff'): git checkout -f master * Make sure the master is up-to-date: git pull * Apply the changes that you want to your working files, e.g.: patch -p1