diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2003-07-26 12:06:30 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2003-07-26 12:06:30 +0000 |
| commit | 2bd24962f2788c6ae4a2eb3889983550705e443d (patch) | |
| tree | 88f473edebb549d55bde4566d0f19c40e8a99d8d | |
| parent | 863ca769213005f06c68d59df1627cd15809bd50 (diff) | |
| download | quilt-2bd24962f2788c6ae4a2eb3889983550705e443d.tar.gz | |
- Pushing is only possible if the topmost file is found in the
series file. Fix from Tom Wang <wangdi@clusterfs.com>.
| -rw-r--r-- | quilt.changes | 6 | ||||
| -rw-r--r-- | quilt/push.in | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/quilt.changes b/quilt.changes index 8f323c6..ea1cccb 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sat Jul 26 13:10:19 CEST 2003 - agruen@suse.de + +- Pushing is only possible if the topmost file is found in the + series file. Fix from Tom Wang <wangdi@clusterfs.com>. + +------------------------------------------------------------------- Sat Jul 26 13:06:07 CEST 2003 - agruen@suse.de - When popping files, go through the list of applied patches diff --git a/quilt/push.in b/quilt/push.in index 09c7294..20c6074 100644 --- a/quilt/push.in +++ b/quilt/push.in @@ -174,6 +174,14 @@ then if [ -z "$top" ] then echo $"No patch applied" + elif [ -z "$(patch_file_name $top)" ] + then + echo -e \ +$"The topmost patch $top is not in the series file anymore; +cannot determine the next patch from the series file. +Please pop -f the top patch and check your series file." + exit 1 + else echo $"File series fully applied, ends at patch $top" fi |