X-Git-Url: https://scripts.mit.edu/gitweb/wizard.git/blobdiff_plain/a504eefd8719a52b14217c2a1152db151504f99a..62994ff28f8141558fcab88e07916d2cce08b47e:/TODO

diff --git a/TODO b/TODO
index a351d0b..0a9ba15 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,21 @@
 - [SCRIPTS] MediaWiki 1.9.3 and 1.6.7
 
+- The merge interface is a kind of major UI disaster; you won't
+  be able to use it unless you know how Git works.  Also, the
+  merges can be quite difficult to resolve if upstream has made
+  large formatting changes like reindenting.  We may also consider
+  providing a --rebase option, which seems to do better when
+  big problems like this show up.
+
+- Repeated --continue from a temporary directory doesn't really work...
+  (or maybe this interacts /really/ poorly with restore, in which case
+  restore should ensure all files are present before actually doing the
+  restore)
+- Should be able to run restore from /tmp directory
+- Show progress or something when upgrading
+- Allow 'sticky notes' for future upgraders to notice
+- Blacklist should allow an easy way for a user to override it,
+  described in the error message.
 - .wizard/url semantics are subtly wrong: in particular, if we
   explicitly configure a URL at install, we should be able to
   detect this URL as baked in from the configuration