From d08865a64841c43ce6730baf7078500233976d32 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Mon, 11 Jul 2005 18:45:40 +0100 Subject: [PATCH 1/1] Allow local changes if the patch deleted is not current Signed-off-by: Catalin Marinas --- ChangeLog | 2 ++ stgit/main.py | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5b7e9d6..3b2fc75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ * stgit/main.py (export): Add --template option to use a different file as the export template rather than the default one + (delete): Check for local changes only of the current patch is + removed 2005-07-09 Catalin Marinas diff --git a/stgit/main.py b/stgit/main.py index d93f2eb..ebbff64 100644 --- a/stgit/main.py +++ b/stgit/main.py @@ -363,9 +363,10 @@ def delete(parser, options, args): if len(args) != 1: parser.error('incorrect number of arguments') - __check_local_changes() - __check_conflicts() - __check_head_top_equal() + if args[0] == crt_series.get_current(): + __check_local_changes() + __check_conflicts() + __check_head_top_equal() crt_series.delete_patch(args[0]) print 'Patch "%s" successfully deleted' % args[0] -- 2.11.0