On 2007-09-13 21:22:19 -0400, Jon Smirl wrote:
> The patch turns it into an error message instead of an assertion.
As intended.
> Note sure what to do here, I wanted to sink with the patches
> unapplied since the patch that is being sunk is going to have merge
> errors when it gets applied. How do a get a chance to fix them?
>
> I want to reorder the patches, then apply them one at a time which
> will allow me to edit in corrections for the ordering change,
The way to do this currently is by telling "stg push" which patch you
want to push. For example, if you have the unapplied patches
foo
bar
baz
elvis
and you want to push all of them but foo (thus sinking them below
foo), say
$ stg push bar..elvis
or, equivalently,
$ stg push bar..
I agree that "stg sink" could be more helpful here by, for example,
reordering (but not pushing) when told to sink one unapplied patch
below another. My patch was just a minimal fix to get rid of the
uncaught exception and exit in an orderly fashion.
--
Karl Hasselström, kha@xxxxxxxxxxx
www.treskal.com/kalle
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
