--- a/tests/test-up-local-change.t Tue Dec 02 17:11:01 2014 -0800
+++ b/tests/test-up-local-change.t Sun Nov 16 23:41:44 2014 -0800
@@ -231,8 +231,6 @@
test conflicting untracked ignored file
-BROKEN: the ignored file gets overwritten by the remote version
-
$ hg up -qC 0
$ echo ignored > .hgignore
$ hg add .hgignore
@@ -246,9 +244,9 @@
$ echo untracked > ignored
$ hg st
$ hg up 'desc("add ignored file")'
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ cat ignored
- ignored
+ ignored: untracked file differs
+ abort: untracked files in working directory differ from files in requested revision
+ [255]
test a local add