diff tests/test-import.out @ 6001:30d2fecaab76

merge with crew-stable
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sun, 03 Feb 2008 21:47:07 -0200
parents e7f1be4bf40a a732eebf1958
children 36ab165abbe2
line wrap: on
line diff
--- a/tests/test-import.out	Sat Feb 02 21:01:43 2008 +0100
+++ b/tests/test-import.out	Sun Feb 03 21:47:07 2008 -0200
@@ -152,6 +152,12 @@
 
 next line
 ---
+% import patch1 patch2; rollback
+parent: 0
+applying ../patch1
+applying ../patch2
+rolling back last transaction
+parent: 1
 % hg import in a subdirectory
 requesting all changes
 adding changesets