More TODO notes, and update gitignore.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>

diff --git a/.gitignore b/.gitignore
index 0f8873e9dfdf1680c293e244219e86648e831361..0f766b8dca02efb57224e2b605a70f351a25af31 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 *.swp
 *~
 wizard.egg-info
+build
+dist

diff --git a/TODO b/TODO
index 6afc3bec69e38e3dc4fe1e12da1c4e90f16e03d9..0a9ba15f86121332767572680398d87ef775e73b 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,5 +1,19 @@
 - [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