Re: [StGit PATCH 07/10] Teach the new infrastructure about the index and worktree

From

Karl Hasselström <kha@treskal.com>

Date

Nov 26, 2007, 08:31 UTC

Message-ID

<20071126083104.GA3591@diana.vm.bytemark.co.uk>

In-Reply-To

<20071125205140.7823.46991.stgit@yoghurt>

On 2007-11-25 21:51:40 +0100, Karl Hasselström wrote:

> And use the new powers to make "stg coalesce" able to handle
> arbitrary patches, not just consecutive applied patches.

diff --git a/stgit/commands/coalesce.py b/stgit/commands/coalesce.py
index 2b121a9..6c0ae6d 100644
--- a/stgit/commands/coalesce.py
+++ b/stgit/commands/coalesce.py
@@ -27,8 +27,11 @@ help = 'coalesce two or more patches into one'
 usage = """%prog [options] <patches>
 
 Coalesce two or more patches, creating one big patch that contains all
-their changes. The patches must all be applied, and must be
-consecutive."""
+their changes.
+
+If there are conflicts when reordering the patches to match the order
+you specify, you will have to resolve them manually just as if you had
+done a sequence of pushes and pops yourself."""
 
 directory = common.DirectoryHasRepositoryLib()
 options = [make_option('-n', '--name', help = 'name of coalesced patch'),

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle