Re: stg clean removes conflicting patch

On 2008-01-25 09:53:46 +0000, Catalin Marinas wrote:

On 25/01/2008, Karl Hasselström [off-list ref] wrote:

quoted

On 2008-01-24 22:55:17 -0500, Pavel Roskin wrote:

quoted

If "stg push" fails, the subsequent "stg clean" will remove the
patch that could not been applied. I think it's wrong.

I agree. It's consistent -- a conflicting patch is empty -- but
clearly the wrong thing to do from a usability perspective.

Got broken by commit fe1cee2e49d9995852ba92d8fba1d064acf2fca9 which
removes the check_conflicts() call.

Ah, thanks. I didn't realize it used to work.

As I said in a different post, we should add these back (and to the
'goto' command as well) to make StGIT safer.

The right thing to do would be to check for conflicts before
attempting any kind of modification, I guess.

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