tests/test-rebase-collapse.t
changeset 18778 1ef89df2c248
parent 18648 76b69cccb07a
child 19924 c23c62209cc4
--- a/tests/test-rebase-collapse.t	Sun Mar 17 23:27:14 2013 -0500
+++ b/tests/test-rebase-collapse.t	Fri Mar 15 11:23:29 2013 -0700
@@ -719,6 +719,30 @@
 
   $ cd ..
 
+Test collapsing changes that add then remove a file
 
+  $ hg init collapseaddremove
+  $ cd collapseaddremove
 
+  $ touch base
+  $ hg commit -Am base
+  adding base
+  $ touch a
+  $ hg commit -Am a
+  adding a
+  $ hg rm a
+  $ touch b
+  $ hg commit -Am b
+  adding b
+  $ hg rebase -d 0 -r "1::2" --collapse -m collapsed
+  saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/*-backup.hg (glob)
+  $ hg tglog
+  @  1: 'collapsed'
+  |
+  o  0: 'base'
+  
+  $ hg manifest
+  b
+  base
 
+  $ cd ..