- add command: "File %s added to patch %s" message goes to stdout

  and not to stderr (Jean Delvare).
- Don't fail when popping missing patches (Jerome Lacoste, Jean
  Delvare, I).

9 files changed, 153 insertions, 93 deletions

diff --git a/po/de.po b/po/de.po
index 1aa158e..ad8a975 100644
--- a/po/de.po
+++ b/po/de.po
@@ -73,20 +73,20 @@ msgstr "Die Datei %s befindet sich unter dem Verzeichnis %s\\n"
 
 #: ../quilt/add.in:78 ../quilt/applied.in:62 ../quilt/delete.in:76
 #: ../quilt/diff.in:160 ../quilt/diff.in:171 ../quilt/graph.in:116
-#: ../quilt/next.in:62 ../quilt/pop.in:239 ../quilt/previous.in:62
-#: ../quilt/push.in:311 ../quilt/refresh.in:148 ../quilt/remove.in:53
+#: ../quilt/next.in:62 ../quilt/pop.in:246 ../quilt/previous.in:62
+#: ../quilt/push.in:312 ../quilt/refresh.in:148 ../quilt/remove.in:53
 #: ../quilt/unapplied.in:62
 msgid "Patch %s is not in series\\n"
 msgstr "Patch %s ist nicht in der series-Datei enthalten\\n"
 
 #: ../quilt/add.in:99 ../quilt/diff.in:239 ../quilt/graph.in:121
-#: ../quilt/pop.in:254 ../quilt/refresh.in:154 ../quilt/remove.in:74
+#: ../quilt/pop.in:261 ../quilt/refresh.in:154 ../quilt/remove.in:74
 msgid "Patch %s is not applied\\n"
 msgstr "Patch %s ist nicht angewandt\\n"
 
 #: ../quilt/add.in:106 ../quilt/delete.in:68 ../quilt/diff.in:247
 #: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:72
-#: ../quilt/graph.in:131 ../quilt/pop.in:288 ../quilt/push.in:349
+#: ../quilt/graph.in:131 ../quilt/pop.in:295 ../quilt/push.in:350
 #: ../quilt/refresh.in:162 ../quilt/remove.in:81
 msgid "No patches applied\\n"
 msgstr "Keine Patches angewandt\\n"
@@ -721,19 +721,24 @@ msgstr ""
 "Patch %s kann nicht entfernt werden (Patch auffrischen oder Entfernen "
 "erzwingen mit -f)\\n"
 
-#: ../quilt/pop.in:178
+#: ../quilt/pop.in:181
+#, fuzzy
+msgid "Patch %s appears to be empty, removing\\n"
+msgstr "Patch %s scheint leer zu sein\\n"
+
+#: ../quilt/pop.in:185
 msgid "Removing patch %s\\n"
 msgstr "Entferne patch %s\\n"
 
-#: ../quilt/pop.in:262
+#: ../quilt/pop.in:269
 msgid "Patch %s needs to be refreshed first.\\n"
 msgstr "Patch %s muss zuerst aufgefrischt werden (Refresh).\\n"
 
-#: ../quilt/pop.in:272
+#: ../quilt/pop.in:279
 msgid "No patch removed\\n"
 msgstr "Kein Patch entfernt\\n"
 
-#: ../quilt/pop.in:295 ../quilt/push.in:371
+#: ../quilt/pop.in:302 ../quilt/push.in:372
 msgid "Now at patch %s\\n"
 msgstr "Jetzt in Patch %s\\n"
 
@@ -815,39 +820,40 @@ msgstr ""
 msgid "Interrupted by user; patch %s was not applied.\\n"
 msgstr "Unterbrechung durch Benutzer; Patch %s wurde nicht angewandt.\\n"
 
-#: ../quilt/push.in:96
-msgid "Patch %s appears to be empty\\n"
-msgstr "Patch %s scheint leer zu sein\\n"
-
-#: ../quilt/push.in:160
+#: ../quilt/push.in:157
 msgid "Applying patch %s\\n"
 msgstr "Wende Patch %s an\\n"
 
-#: ../quilt/push.in:192
+#: ../quilt/push.in:189
+#, fuzzy
+msgid "Patch %s does not exist, applied\\n"
+msgstr "Patch %s ist nicht angewandt\\n"
+
+#: ../quilt/push.in:193
 msgid "Patch %s appears to be empty, applied\\n"
 msgstr "Patch %s scheint leer zu sein, angewandt\\n"
 
-#: ../quilt/push.in:196
+#: ../quilt/push.in:197
 msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr "Patch %s angewandt (erzwungen, muß aufgefrischt werden (Refresh))\\n"
 
-#: ../quilt/push.in:201
+#: ../quilt/push.in:202
 msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr "Patch %s läßt sich nicht anwenden (erzwingen mit -f)\\n"
 
-#: ../quilt/push.in:240
+#: ../quilt/push.in:241
 msgid "Patch %s not found in file series\\n"
 msgstr "Patch %s nicht in series-Datei gefunden\\n"
 
-#: ../quilt/push.in:328
+#: ../quilt/push.in:329
 msgid "Patch %s is already applied\\n"
 msgstr "Patch %s ist bereits angewandt\\n"
 
-#: ../quilt/push.in:337
+#: ../quilt/push.in:338
 msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr "Der oberste Patch %s muss zuerst aufgefrischt werden (Refresh).\\n"
 
-#: ../quilt/push.in:351
+#: ../quilt/push.in:352
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n"
 
diff --git a/po/fr.po b/po/fr.po
index 4886cc1..8e750e7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -75,20 +75,20 @@ msgstr "Le fichier %s n'est pas dans le patch %s.\\n"
 
 #: ../quilt/add.in:78 ../quilt/applied.in:62 ../quilt/delete.in:76
 #: ../quilt/diff.in:160 ../quilt/diff.in:171 ../quilt/graph.in:116
-#: ../quilt/next.in:62 ../quilt/pop.in:239 ../quilt/previous.in:62
-#: ../quilt/push.in:311 ../quilt/refresh.in:148 ../quilt/remove.in:53
+#: ../quilt/next.in:62 ../quilt/pop.in:246 ../quilt/previous.in:62
+#: ../quilt/push.in:312 ../quilt/refresh.in:148 ../quilt/remove.in:53
 #: ../quilt/unapplied.in:62
 msgid "Patch %s is not in series\\n"
 msgstr "Le patch %s n'est pas dans la série\\n"
 
 #: ../quilt/add.in:99 ../quilt/diff.in:239 ../quilt/graph.in:121
-#: ../quilt/pop.in:254 ../quilt/refresh.in:154 ../quilt/remove.in:74
+#: ../quilt/pop.in:261 ../quilt/refresh.in:154 ../quilt/remove.in:74
 msgid "Patch %s is not applied\\n"
 msgstr "Le patch %s n'est pas appliqué\\n"
 
 #: ../quilt/add.in:106 ../quilt/delete.in:68 ../quilt/diff.in:247
 #: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:72
-#: ../quilt/graph.in:131 ../quilt/pop.in:288 ../quilt/push.in:349
+#: ../quilt/graph.in:131 ../quilt/pop.in:295 ../quilt/push.in:350
 #: ../quilt/refresh.in:162 ../quilt/remove.in:81
 msgid "No patches applied\\n"
 msgstr "Aucun patch n'est appliqué\\n"
@@ -681,19 +681,24 @@ msgstr ""
 "Le patch %s ne se retire pas proprement (rafraichissez le, ou forcez avec -f)"
 "\\n"
 
-#: ../quilt/pop.in:178
+#: ../quilt/pop.in:181
+#, fuzzy
+msgid "Patch %s appears to be empty, removing\\n"
+msgstr "Le patch %s semble vide.\\n"
+
+#: ../quilt/pop.in:185
 msgid "Removing patch %s\\n"
 msgstr "Retrait de %s\\n"
 
-#: ../quilt/pop.in:262
+#: ../quilt/pop.in:269
 msgid "Patch %s needs to be refreshed first.\\n"
 msgstr "Le patch %s doit être rafraichi au préalable.\\n"
 
-#: ../quilt/pop.in:272
+#: ../quilt/pop.in:279
 msgid "No patch removed\\n"
 msgstr "Aucun patch retiré\\n"
 
-#: ../quilt/pop.in:295 ../quilt/push.in:371
+#: ../quilt/pop.in:302 ../quilt/push.in:372
 msgid "Now at patch %s\\n"
 msgstr "Le patch %s est maintenant au sommet\\n"
 
@@ -779,40 +784,41 @@ msgstr ""
 msgid "Interrupted by user; patch %s was not applied.\\n"
 msgstr "Interrompu par l'utilisateur ; le patch %s n'a pas été appliqué.\\n"
 
-#: ../quilt/push.in:96
-msgid "Patch %s appears to be empty\\n"
-msgstr "Le patch %s semble vide.\\n"
-
-#: ../quilt/push.in:160
+#: ../quilt/push.in:157
 msgid "Applying patch %s\\n"
 msgstr "Application de %s\\n"
 
-#: ../quilt/push.in:192
+#: ../quilt/push.in:189
+#, fuzzy
+msgid "Patch %s does not exist, applied\\n"
+msgstr "Le patch %s n'est pas appliqué\\n"
+
+#: ../quilt/push.in:193
 msgid "Patch %s appears to be empty, applied\\n"
 msgstr "Le patch %s semble vide. Il a été appliqué.\\n"
 
-#: ../quilt/push.in:196
+#: ../quilt/push.in:197
 msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr "%s a été appliqué (forcé ; vous devriez le rafraîchir)\\n"
 
-#: ../quilt/push.in:201
+#: ../quilt/push.in:202
 msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr ""
 "Le patch %s ne s'applique pas proprement (forcez l'application avec -f)\\n"
 
-#: ../quilt/push.in:240
+#: ../quilt/push.in:241
 msgid "Patch %s not found in file series\\n"
 msgstr "Le patch %s est introuvable dans le fichier de série\\n"
 
-#: ../quilt/push.in:328
+#: ../quilt/push.in:329
 msgid "Patch %s is already applied\\n"
 msgstr "Le patch %s est déjà appliqué.\\n"
 
-#: ../quilt/push.in:337
+#: ../quilt/push.in:338
 msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr "Le patch au sommet %s doit être rafraichi au préalable.\\n"
 
-#: ../quilt/push.in:351
+#: ../quilt/push.in:352
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr "La série est complètement appliquée. Le dernier patch est %s.\\n"
 
diff --git a/po/ja.po b/po/ja.po
index 8ab2d39..3736c04 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -73,20 +73,20 @@ msgstr "ファイル \\`%s'��\\`%s'以下��り��\\n"
 
 #: ../quilt/add.in:78 ../quilt/applied.in:62 ../quilt/delete.in:76
 #: ../quilt/diff.in:160 ../quilt/diff.in:171 ../quilt/graph.in:116
-#: ../quilt/next.in:62 ../quilt/pop.in:239 ../quilt/previous.in:62
-#: ../quilt/push.in:311 ../quilt/refresh.in:148 ../quilt/remove.in:53
+#: ../quilt/next.in:62 ../quilt/pop.in:246 ../quilt/previous.in:62
+#: ../quilt/push.in:312 ../quilt/refresh.in:148 ../quilt/remove.in:53
 #: ../quilt/unapplied.in:62
 msgid "Patch %s is not in series\\n"
 msgstr "パッ� %s � series�中��り��ん\\n"
 
 #: ../quilt/add.in:99 ../quilt/diff.in:239 ../quilt/graph.in:121
-#: ../quilt/pop.in:254 ../quilt/refresh.in:154 ../quilt/remove.in:74
+#: ../quilt/pop.in:261 ../quilt/refresh.in:154 ../quilt/remove.in:74
 msgid "Patch %s is not applied\\n"
 msgstr "パッ� %s ��用�れ����ん\\n"
 
 #: ../quilt/add.in:106 ../quilt/delete.in:68 ../quilt/diff.in:247
 #: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:72
-#: ../quilt/graph.in:131 ../quilt/pop.in:288 ../quilt/push.in:349
+#: ../quilt/graph.in:131 ../quilt/pop.in:295 ../quilt/push.in:350
 #: ../quilt/refresh.in:162 ../quilt/remove.in:81
 msgid "No patches applied\\n"
 msgstr "�用�れ��るパッ���り��ん\\n"
@@ -712,19 +712,24 @@ msgstr ""
 "パッ� %s を�正常�����������ん (リフレッシュ�る� -fを付\n"
 "����������)\\n"
 
-#: ../quilt/pop.in:178
+#: ../quilt/pop.in:181
+#, fuzzy
+msgid "Patch %s appears to be empty, removing\\n"
+msgstr "パッ� %s��空�よ���\\n"
+
+#: ../quilt/pop.in:185
 msgid "Removing patch %s\\n"
 msgstr "パッ� %s を削除���\\n"
 
-#: ../quilt/pop.in:262
+#: ../quilt/pop.in:269
 msgid "Patch %s needs to be refreshed first.\\n"
 msgstr "最���パッ� %s �リフレッシュ�必���。\\n"
 
-#: ../quilt/pop.in:272
+#: ../quilt/pop.in:279
 msgid "No patch removed\\n"
 msgstr "�用�れ��るパッ���り��ん\\n"
 
-#: ../quilt/pop.in:295 ../quilt/push.in:371
+#: ../quilt/pop.in:302 ../quilt/push.in:372
 msgid "Now at patch %s\\n"
 msgstr "�在�置�パッ� %s ��"
 
@@ -808,40 +813,41 @@ msgstr ""
 msgid "Interrupted by user; patch %s was not applied.\\n"
 msgstr "ユーザ�よ��中断�れ���。パッ� % ��用�れ����ん。\\n"
 
-#: ../quilt/push.in:96
-msgid "Patch %s appears to be empty\\n"
-msgstr "パッ� %s��空�よ���\\n"
-
-#: ../quilt/push.in:160
+#: ../quilt/push.in:157
 msgid "Applying patch %s\\n"
 msgstr "パッ� %s を�用�����\\n"
 
-#: ../quilt/push.in:192
+#: ../quilt/push.in:189
+#, fuzzy
+msgid "Patch %s does not exist, applied\\n"
+msgstr "パッ� %s ��用�れ����ん\\n"
+
+#: ../quilt/push.in:193
 msgid "Patch %s appears to be empty, applied\\n"
 msgstr "パッ� %s �空�よ������用����\\n"
 
-#: ../quilt/push.in:196
+#: ../quilt/push.in:197
 msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr ""
 "パッ� % を�用���� (強制�用������リフレッシュ�必���)\\n"
 
-#: ../quilt/push.in:201
+#: ../quilt/push.in:202
 msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr "パッ� %s��用����ん (強制�用�る場�� -fを付������)\\n"
 
-#: ../quilt/push.in:240
+#: ../quilt/push.in:241
 msgid "Patch %s not found in file series\\n"
 msgstr "パッ� %s � seriesファイル内�見��り��ん。\\n"
 
-#: ../quilt/push.in:328
+#: ../quilt/push.in:329
 msgid "Patch %s is already applied\\n"
 msgstr "パッ� %s ������用済��\\n"
 
-#: ../quilt/push.in:337
+#: ../quilt/push.in:338
 msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr "最上�パッ��リフレッシュ�最��必���。\\n"
 
-#: ../quilt/push.in:351
+#: ../quilt/push.in:352
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr ""
 "seriesファイル�パッ������用�れ����。最終パッ�� %s ��。\\n"
diff --git a/po/quilt.pot b/po/quilt.pot
index d221b81..9ad36f5 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -41,20 +41,20 @@ msgstr ""
 
 #: ../quilt/add.in:78 ../quilt/applied.in:62 ../quilt/delete.in:76
 #: ../quilt/diff.in:160 ../quilt/diff.in:171 ../quilt/graph.in:116
-#: ../quilt/next.in:62 ../quilt/pop.in:239 ../quilt/previous.in:62
-#: ../quilt/push.in:311 ../quilt/refresh.in:148 ../quilt/remove.in:53
+#: ../quilt/next.in:62 ../quilt/pop.in:246 ../quilt/previous.in:62
+#: ../quilt/push.in:312 ../quilt/refresh.in:148 ../quilt/remove.in:53
 #: ../quilt/unapplied.in:62
 msgid "Patch %s is not in series\\n"
 msgstr ""
 
 #: ../quilt/add.in:99 ../quilt/diff.in:239 ../quilt/graph.in:121
-#: ../quilt/pop.in:254 ../quilt/refresh.in:154 ../quilt/remove.in:74
+#: ../quilt/pop.in:261 ../quilt/refresh.in:154 ../quilt/remove.in:74
 msgid "Patch %s is not applied\\n"
 msgstr ""
 
 #: ../quilt/add.in:106 ../quilt/delete.in:68 ../quilt/diff.in:247
 #: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:72
-#: ../quilt/graph.in:131 ../quilt/pop.in:288 ../quilt/push.in:349
+#: ../quilt/graph.in:131 ../quilt/pop.in:295 ../quilt/push.in:350
 #: ../quilt/refresh.in:162 ../quilt/remove.in:81
 msgid "No patches applied\\n"
 msgstr ""
@@ -509,19 +509,23 @@ msgstr ""
 msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n"
 msgstr ""
 
-#: ../quilt/pop.in:178
+#: ../quilt/pop.in:181
+msgid "Patch %s appears to be empty, removing\\n"
+msgstr ""
+
+#: ../quilt/pop.in:185
 msgid "Removing patch %s\\n"
 msgstr ""
 
-#: ../quilt/pop.in:262
+#: ../quilt/pop.in:269
 msgid "Patch %s needs to be refreshed first.\\n"
 msgstr ""
 
-#: ../quilt/pop.in:272
+#: ../quilt/pop.in:279
 msgid "No patch removed\\n"
 msgstr ""
 
-#: ../quilt/pop.in:295 ../quilt/push.in:371
+#: ../quilt/pop.in:302 ../quilt/push.in:372
 msgid "Now at patch %s\\n"
 msgstr ""
 
@@ -575,39 +579,39 @@ msgstr ""
 msgid "Interrupted by user; patch %s was not applied.\\n"
 msgstr ""
 
-#: ../quilt/push.in:96
-msgid "Patch %s appears to be empty\\n"
+#: ../quilt/push.in:157
+msgid "Applying patch %s\\n"
 msgstr ""
 
-#: ../quilt/push.in:160
-msgid "Applying patch %s\\n"
+#: ../quilt/push.in:189
+msgid "Patch %s does not exist, applied\\n"
 msgstr ""
 
-#: ../quilt/push.in:192
+#: ../quilt/push.in:193
 msgid "Patch %s appears to be empty, applied\\n"
 msgstr ""
 
-#: ../quilt/push.in:196
+#: ../quilt/push.in:197
 msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr ""
 
-#: ../quilt/push.in:201
+#: ../quilt/push.in:202
 msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr ""
 
-#: ../quilt/push.in:240
+#: ../quilt/push.in:241
 msgid "Patch %s not found in file series\\n"
 msgstr ""
 
-#: ../quilt/push.in:328
+#: ../quilt/push.in:329
 msgid "Patch %s is already applied\\n"
 msgstr ""
 
-#: ../quilt/push.in:337
+#: ../quilt/push.in:338
 msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr ""
 
-#: ../quilt/push.in:351
+#: ../quilt/push.in:352
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr ""
 
diff --git a/quilt.changes b/quilt.changes
index 514adeb..800377a 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Tue Jun 21 23:54:51 CEST 2005 - agruen@suse.de
+
+- add command: "File %s added to patch %s" message goes to stdout
+  and not to stderr (Jean Delvare).
+- Don't fail when popping missing patches (Jerome Lacoste, Jean
+  Delvare, I).
+
+-------------------------------------------------------------------
 Sat Jun 18 19:51:36 CEST 2005 - agruen@suse.de
 
 - Add fix for refresh --strip-trailing-whitespace option: now
diff --git a/quilt/add.in b/quilt/add.in
index a2b8ab3..17a7b08 100644
--- a/quilt/add.in
+++ b/quilt/add.in
@@ -153,7 +153,7 @@ do
 	fi
 
 	printf $"File %s added to patch %s\n" \
-	       "$SUBDIR$file" "$(print_patch $patch)" >&2
+	       "$SUBDIR$file" "$(print_patch $patch)"
 done
 exit $status
 ### Local Variables:
diff --git a/quilt/pop.in b/quilt/pop.in
index 7abb052..42ddf65 100644
--- a/quilt/pop.in
+++ b/quilt/pop.in
@@ -175,10 +175,17 @@ remove_patch()
 
 	if [ $status -eq 0 ]
 	then
-		printf $"Removing patch %s\n" "$(print_patch $patch)"
 		rm -f "$QUILT_PC/$patch/.timestamp"
-		@LIB@/backup-files $silent -r -t -B $QUILT_PC/$patch/ -
-		status=$?
+		if [ -z "$(shopt -s nullglob ; echo "$QUILT_PC/$patch/"*)" ]
+		then
+			printf $"Patch %s appears to be empty, removing\n" \
+			       "$(print_patch $patch)"
+			status=0
+		else
+			printf $"Removing patch %s\n" "$(print_patch $patch)"
+			@LIB@/backup-files $silent -r -t -B $QUILT_PC/$patch/ -
+			status=$?
+		fi
 		remove_from_db $patch
 		rm -f $QUILT_PC/$patch~refresh
 	fi
diff --git a/quilt/push.in b/quilt/push.in
index a924127..6cb401a 100644
--- a/quilt/push.in
+++ b/quilt/push.in
@@ -88,15 +88,11 @@ colorize()
 
 apply_patch()
 {
-	local patch=$1
-	local patch_file=$(patch_file_name $patch) output
+	local patch=$1 patch_file=$2
+	local output
+
+	[ -s $patch_file ] || return 0
 
-	if ! [ -s $patch_file ]
-	then
-		printf $"Patch %s appears to be empty\n" "$patch_file"
-		return 0
-	fi
-	
 	if [ "${patch_file:(-3)}" = ".gz" ]
 	then
 		gzip -cd $patch_file \
@@ -155,6 +151,7 @@ cleanup_patch_output() {
 add_patch()
 {
 	local patch=$1
+	local patch_file=$(patch_file_name $patch)
 	local file status tmp
 
 	printf $"Applying patch %s\n" "$(print_patch $patch)"
@@ -166,7 +163,7 @@ add_patch()
 		no_reject_files="-r $tmp"
 	fi
 
-	apply_patch $patch
+	apply_patch $patch "$patch_file"
 	status=${PIPESTATUS[0]}
 	trap "" SIGINT
 
@@ -187,7 +184,11 @@ add_patch()
 			touch $QUILT_PC/$patch/.timestamp
 		fi
 
-		if [ "$(shopt -s nullglob ; echo "$QUILT_PC/$patch/"*)" = "" ]
+		if ! [ -e $patch_file ]
+		then
+			printf $"Patch %s does not exist, applied\n" \
+			       "$(print_patch $patch)"
+		elif [ -z "$(shopt -s nullglob ; echo "$QUILT_PC/$patch/"*)" ]
 		then
 			printf $"Patch %s appears to be empty, applied\n" \
 			       "$(print_patch $patch)"
diff --git a/test/missing.test b/test/missing.test
new file mode 100644
index 0000000..2ef8502
--- /dev/null
+++ b/test/missing.test
@@ -0,0 +1,22 @@
+	$ mkdir d
+	$ cd d
+
+	$ mkdir patches
+	$ cat > patches/series
+	< missing1.diff
+	< missing2.diff
+	
+	$ quilt push -qa
+	> Applying patch patches/missing1.diff
+	> Patch patches/missing1.diff does not exist, applied
+	> Applying patch patches/missing2.diff
+	> Patch patches/missing2.diff does not exist, applied
+	> Now at patch patches/missing2.diff
+
+	$ quilt pop -qa
+	> Patch patches/missing2.diff appears to be empty, removing
+	> Patch patches/missing1.diff appears to be empty, removing
+	> No patches applied
+	
+	$ cd ..
+	$ rm -rf d