[or-cvs] r21617: {projects} clean up the project file, note we're behind in a few places (projects/todo)

[Andrew Lewman]

Author: phobos
Date: 2010-02-10 20:42:33 +0000 (Wed, 10 Feb 2010)
New Revision: 21617

Modified:
   projects/todo/tpo-highlevel-tasklist.tjp
   projects/todo/tracking-gantt.pdf
Log:
clean up the project file, note we're behind in a few places, build a
tracking-gantt pdf for the world without taskjuggler.


Modified: projects/todo/tpo-highlevel-tasklist.tjp
===================================================================
--- projects/todo/tpo-highlevel-tasklist.tjp	2010-02-10 20:26:42 UTC (rev 21616)
+++ projects/todo/tpo-highlevel-tasklist.tjp	2010-02-10 20:42:33 UTC (rev 21617)
@@ -34,11 +34,7 @@
 task op_main "Business Operations" {
   task op_one "Community Forums" {
     start 2009-11-19
-<<<<<<< .mine
     end 2010-02-28
-=======
-    end 2010-01-31
->>>>>>> .r21615
     allocate andrew, volunteer, vendor
     complete 75
     }
@@ -68,25 +64,13 @@
   }
   task op_six "Audit Prep" {
     start 2009-11-19
-<<<<<<< .mine
     end 2010-02-28
-=======
-    end 2010-01-31
->>>>>>> .r21615
     allocate andrew, melissa, auditor
-<<<<<<< .mine
-    complete 85
-=======
     complete 95
->>>>>>> .r21615
   }
   task op_seven "Tor Logo Store" {
     start 2009-11-19
-<<<<<<< .mine
     end 2010-02-15
-=======
-    end 2010-01-31
->>>>>>> .r21615
     allocate andrew, karen, vendor
     complete 50
   }
@@ -100,19 +84,11 @@
     start 2009-11-19
     end 2010-02-28
     allocate andrew, karen
-<<<<<<< .mine
     complete 30
-=======
-    complete 35
->>>>>>> .r21615
   }
   task op_ten "Migrate wiki" {
     start 2009-11-19
-<<<<<<< .mine
-    effort 3d
-=======
     effort 5d
->>>>>>> .r21615
     allocate andrew, volunteer
     complete 50
   }
@@ -124,23 +100,13 @@
   }
   task op_twelve "Advocacy Videos" {
     start 2009-11-19
-<<<<<<< .mine
     end 2010-01-31
     allocate karen
     complete 100
-=======
-    end 2010-01-31
-    allocate karen, carolyn
-    complete 100
->>>>>>> .r21615
   }
   task op_thirteen "Brochure" {
     start 2009-11-19
-<<<<<<< .mine
     end 2010-02-28
-=======
-    end 2010-01-31
->>>>>>> .r21615
     allocate karen
     complete 50
   }
@@ -148,29 +114,17 @@
     start 2010-01-01
     end 2010-12-31
     allocate karen, andrew
-<<<<<<< .mine
     complete 100
-=======
-    complete 10
->>>>>>> .r21615
   }
   task op_fifteen "Tor Support Organization" {
     start 2009-11-19
-<<<<<<< .mine
-    effort 14d
-=======
     effort 60d
->>>>>>> .r21615
     allocate andrew
     complete 0
   }
   task op_sixteen "Friends of Tor International" {
     start 2009-11-19
-<<<<<<< .mine
-    effort 14d
-=======
     effort 60d
->>>>>>> .r21615
     allocate andrew
     complete 0
   }
@@ -205,11 +159,7 @@
     start 2009-11-19
     end 2009-12-31
     allocate carolyn, volunteer
-<<<<<<< .mine
     complete 85
-=======
-    complete 75
->>>>>>> .r21615
   }
   task tr_three "Arabic Translator" {
     start 2009-11-19
@@ -266,11 +216,7 @@
     start 2009-11-19
     end 2010-02-28
     allocate melissa, andrew
-<<<<<<< .mine
     complete 90
-=======
-    complete 100
->>>>>>> .r21615
   }
   task fin_four "Monthly Report Generation" {
     start 2009-11-19
@@ -461,21 +407,13 @@
   }
   task tb_two "Integrate with private browsing" {
     start 2009-11-19
-<<<<<<< .mine
     effort 30d
-=======
-    end 2010-03-31
->>>>>>> .r21615
     allocate mike
     complete 10
   }
   task tb_three "Google Chrome Integration" {
     start 2009-11-19
-<<<<<<< .mine
     effort 30d
-=======
-    end 2010-03-31
->>>>>>> .r21615
     allocate mike
     complete 30
   }
@@ -609,115 +547,69 @@
     start 2009-11-19
     end 2009-12-31
     allocate bruce
-<<<<<<< .mine
     complete 100
-=======
-    complete 90
->>>>>>> .r21615
   }
 }
 
 task packaging "Packaging Improvements" {
   task pkg_one "Vidalia as deb" {
     start 2009-11-19
-<<<<<<< .mine
     end 2010-01-31
-=======
-    end 2010-01-20
->>>>>>> .r21615
     allocate erinn
     complete 100
   }
   task pkg_two "Vidalia as rpm" {
     start 2009-11-19
-<<<<<<< .mine
-    end 2010-01-31
-=======
     end 2010-02-15
->>>>>>> .r21615
     allocate erinn
-<<<<<<< .mine
     complete 100
-=======
-    complete 50
->>>>>>> .r21615
   }
   task pkg_three "torproject deb repo" {
     start 2009-11-19
-<<<<<<< .mine
     end 2010-01-31
-=======
-    end 2010-01-20
->>>>>>> .r21615
     allocate erinn, peter
     complete 100
   }
   task pkg_four "torproject rpm repo" {
     start 2009-11-19
-<<<<<<< .mine
-    end 2010-01-31
-=======
     end 2010-02-15
->>>>>>> .r21615
     allocate erinn
     complete 100
   }
   task pkg_five "Tor Browser Bundle for OS X" {
     start 2009-11-19
-<<<<<<< .mine
     effort 30d
-=======
-    end 2010-03-31
->>>>>>> .r21615
     allocate erinn, jacob
     complete 50
   }
   task pkg_six "Tor Browser Bundle for Linux" {
     start 2009-11-19
-<<<<<<< .mine
     effort 30d
-=======
-    end 2010-03-31
->>>>>>> .r21615
     allocate erinn, jacob
     complete 50
   }
   task pkg_seven "Nightly package builds" {
     start 2009-11-19
-<<<<<<< .mine
     effort 14d
-=======
-    end 2010-03-31
->>>>>>> .r21615
     allocate erinn
     complete 0
   }
   task pkg_eight "Vidalia Bundle for debian/ubuntu" {
-    start 2009-11-19
-<<<<<<< .mine
     effort 14d
-=======
-    end 2010-03-31
->>>>>>> .r21615
     allocate erinn
     complete 0
-    !depends pkg_ten
+    depends !pkg_ten
   }
   task pkg_nine "Vidalia Bundle for centos/suse" {
-    start 2009-11-19
-<<<<<<< .mine
     effort 14d
-=======
-    end 2010-03-31
->>>>>>> .r21615
     allocate erinn
     complete 0
-    !depends pkg_ten
+    depends !pkg_ten
   }
   task pkg_ten "Vidalia Control Socket Improvements" {
     start 2010-01-01
     effort 5d
-    allocate matt
+    allocate volunteer
     complete 0
   }
 }

Modified: projects/todo/tracking-gantt.pdf
===================================================================
(Binary files differ)