Re: [Ksummit-discuss] [ANNOUNCE] git-series: track changes to a patch series over time

[David Howells <dhowells@redhat.com>]

James Bottomley <James.Bottomley@HansenPartnership.com> wrote:

> I do this too, but I also work with the diff when moving hunks.  What I
> do is:
> 
> git checkout <removal commit>
> git show <removal commit> > tmp.diff
> vi tmp.diff so it only has the hunks I want to remove
> patch -p1 -R < ~/tmp.diff
> git commit --amend -a
> git checkout <add commit>
> patch -p1 < ~/tmp.diff
> git commit --amend -a
> 
> It's a bit cumbersome, but you can script it.  If there are better ways
> to do it, I'm interested.

One of the reasons I use stgit is when it comes to excising changes into a
separate patch, it makes it a lot easier:

	 stg show >tmp.diff	# Export contents of current patch
	 emacs tmp.diff		# Edit so it only has the hunks I want to remove
	 stg pop		# Pop the patch I want to remove part of
	 stg new foo		# Create a new patch
	 stg fold tmp.diff	# ... and apply the patch created above
	 emacs ...		# Fix up any bits
	 stg refresh		# ... and make a commit out of it
	 stg push		# Push the patch I wanted to remove from

The push at the end then attempts to modify the patch you previously popped so
as to effect the excision.  If it can't quite manage it, you'll get <<<<<<<
and suchlike markers indicating the bit it had difficulty with.

I can then very easily switch the order of the patches:

	stg float foo

to put the excised patch last.

I can also:

	 stg pop		# Pop the patch I want to remove part of
	 stg new foo		# Create a new patch
	 emacs ...		# Make the changes I want directly
	 stg refresh		# ... and make a commit out of it
	 stg push		# Reapply the previously popped patch.

As before, the last line will attempt to modify the previously popped patch,
and if it can't it will insert merge failure markers.

David