#
#
# patch "revision.cc"
#  from [4c80573a3753b5de56d7dcba27161d9b391a35cf]
#    to [2fc69719eb75b3b6734d6a1fe418e784ead69ea0]
# 
# patch "roster.cc"
#  from [856300ea8a515dce2e589c874ba8ea6d3553887a]
#    to [38bff54f750d3610ca41b34b402b91be6e52e0b2]
# 
# patch "tests/netsync_permissions/__driver__.lua"
#  from [a19613f2700037bff44aa9880d8106ddf54e72a5]
#    to [00bc19e91496d8b9afe73532c94140df242764d2]
#
============================================================
--- revision.cc	4c80573a3753b5de56d7dcba27161d9b391a35cf
+++ revision.cc	2fc69719eb75b3b6734d6a1fe418e784ead69ea0
@@ -65,18 +65,7 @@ void revision_t::check_sane() const
 
 void revision_t::check_sane() const
 {
-  // null id in current manifest only permitted if previous
-  // state was null and no changes
-  // FIXME: above comment makes no sense.  This should just be
-  // I(!null_id(new_manifest)), and the only reason I am not making it so
-  // right now is that I don't have time to immediately track down all the
-  // fallout.
-  if (null_id(new_manifest))
-    {
-      for (edge_map::const_iterator i = edges.begin();
-           i != edges.end(); ++i)
-        I(null_id(edge_old_revision(i)));
-    }
+  I(!null_id(new_manifest));
 
   if (edges.size() == 1)
     {
@@ -792,8 +781,7 @@ make_revision_for_workspace(revision_id 
 
   rev.edges.clear();
   safe_insert(rev.edges, make_pair(old_rev_id, cs));
-  if (!null_id(old_rev_id))
-    rev.new_manifest = manifest_id(fake_id());
+  rev.new_manifest = manifest_id(fake_id());
   rev.made_for = made_for_workspace;
 }
 
============================================================
--- roster.cc	856300ea8a515dce2e589c874ba8ea6d3553887a
+++ roster.cc	38bff54f750d3610ca41b34b402b91be6e52e0b2
@@ -2803,8 +2803,8 @@ void calculate_ident(roster_t const & ro
   if (!ros.all_nodes().empty())
     {
       write_manifest_of_roster(ros, tmp);
-      calculate_ident(tmp, ident);
     }
+  calculate_ident(tmp, ident);
 }
 
 ////////////////////////////////////////////////////////////////////
============================================================
--- tests/netsync_permissions/__driver__.lua	a19613f2700037bff44aa9880d8106ddf54e72a5
+++ tests/netsync_permissions/__driver__.lua	00bc19e91496d8b9afe73532c94140df242764d2
@@ -107,7 +107,7 @@ writefile("_MTN/revision", 
 clean()
 writefile("_MTN/revision", 
 	  "format_version \"1\"\n\n"..
-	  "new_manifest []\n\n"..
+	  "new_manifest [0000000000000000000000000000000000000000]\n\n"..
 	  "old_revision []\n")
 
 addfile("testfile", "testfile", mtn2)