Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-uncommit-interactive.t
changeset 2943 25576132cb30
parent 2941 b0458b9e1b47
child 2944 281a11bfda43 
--- a/tests/test-uncommit-interactive.t	Tue Sep 05 14:35:00 2017 +0530
+++ b/tests/test-uncommit-interactive.t	Mon Sep 11 17:41:53 2017 +0200
@@ -456,8 +456,6 @@
 Testing when a new file is added in the last commit
 ===================================================
 
-XXX: This is buggy, look for the diff below
-
   $ echo "foo" >> foo
   $ touch x
   $ echo "abcd" >> x
@@ -502,10 +500,6 @@
   @@ -0,0 +1,1 @@
   +abcd
 
-XXX: The diff here should not contain the file 'x' as it is in the commit, there
-is a bug related to dirstate handling of files which are added in the commit
-which we are trying to uncommit. This should be fixed
-
   $ hg diff
   diff -r 25a080d13cb2 foo
   --- a/foo	Thu Jan 01 00:00:00 1970 +0000
@@ -513,19 +507,12 @@
   @@ -1,1 +1,2 @@
    hey
   +foo
-  diff -r 25a080d13cb2 x
-  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/x	Thu Jan 01 00:00:00 1970 +0000
-  @@ -0,0 +1,1 @@
-  +abcd
 
   $ hg status
   M foo
-  A x
 
   $ hg revert --all
   reverting foo
-  forgetting x
 
 Testing between the stack and with dirty working copy
 =====================================================
evolve