all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: "Colin S. Miller" <no-spam-thank-you@csmiller.demon.co.uk>
To: help-gnu-emacs@gnu.org
Subject: Re: Committing only specific hunks in VC
Date: Wed, 12 Jan 2011 21:06:20 +0000	[thread overview]
Message-ID: <4d2e17cd$0$23755$14726298@news.sunsite.dk> (raw)
In-Reply-To: <mailman.33.1294825218.12535.help-gnu-emacs@gnu.org>

Oleksandr Gavenko wrote:
> On 11.01.2011 7:40, Deniz Dogan wrote:
>> I have a bunch of files that have been modified and I'd like to commit
>> all of these changes except for one hunk in one of the files.
>>
>> How would I do this from Emacs? I've heard that it's possible to stage
>> only specific hunks in magit, but I'm using Mercurial.
>>
> I usually save common patch in '.diff' like file.
>

I'd do something similar, when I need to do this in CVS.

I copy the entire tree, and then on the copy use #
M-x cvs-mode and 'd e' to locate the changes I want to remove.

Then I commit from this tree, and afterwards update the original tree.
Patch normally makes a good job of figuring out what to do, unless
one of the non-commited hunks is right beside a commited hunk,
in which case I'd normally delete the original hunk in the conflict and
use 'd e' to decide what parts of the modified hunk to keep.


HTH,
Colin S. Miller
-- 
Replace the obvious in my email address with the first three letters of the hostname to reply.


  parent reply	other threads:[~2011-01-12 21:06 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-11  5:40 Committing only specific hunks in VC Deniz Dogan
2011-01-11 22:57 ` suvayu ali
2011-01-12  8:53   ` Alberto Luaces
2011-01-12  9:03     ` Deniz Dogan
2011-01-12  9:40 ` Oleksandr Gavenko
     [not found] ` <mailman.33.1294825218.12535.help-gnu-emacs@gnu.org>
2011-01-12 21:06   ` Colin S. Miller [this message]
2011-02-18 19:08     ` jpkotta
     [not found] <mailman.5.1294724484.29161.help-gnu-emacs@gnu.org>
2011-01-11 17:28 ` Stefan Monnier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='4d2e17cd$0$23755$14726298@news.sunsite.dk' \
    --to=no-spam-thank-you@csmiller.demon.co.uk \
    --cc=help-gnu-emacs@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.