# 
# patch "ChangeLog"
#  from [cca8fa572e36410501c7b8be9e59811146b45165]
#    to [1bc1907d08f0bfde7e606a3dde46b40da24b0fb2]
# 
# patch "commands.cc"
#  from [958cd3bbc982aef81f63b90b24dcebaddf135166]
#    to [802ab5385a30de04950cf7dbf99f0b445a248a84]
# 
# patch "tests/t_netsync_defaults.at"
#  from [8f37b7de81c532b83851011586762f8c7fd91083]
#    to [09eba929e451e94f6075bd99fe75fc0469ba84e1]
# 
# patch "tests/t_netsync_single.at"
#  from [1fa271a852629b392339705a3b6d5e143b7948c3]
#    to [faa5253849ae86d140b67fb93609d191456b0ec3]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,13 @@
 2005-04-16  Nathaniel Smith  <address@hidden>
 
+	* commands.cc (checkout): Move check for existence of revision
+	earlier.
+	
+	* tests/t_netsync_defaults.at, tests/t_netsync_single.at:
+	Don't hard-code netsync port.
+
+2005-04-16  Nathaniel Smith  <address@hidden>
+
 	* testsuite.at: Use a random server port.
 	
 	* .mt-attrs, contrib/README: Update for Notify.pl ->
--- commands.cc
+++ commands.cc
@@ -1793,6 +1793,9 @@
       dir = idx(args, 1)();
       complete(app, idx(args, 0)(), ident);
       
+      N(app.db.revision_exists(ident),
+        F("no revision %s found in database") % ident);
+
       {
         cert_value b;
         guess_branch(ident, app, b);
@@ -1824,9 +1827,6 @@
   manifest_id mid;
   manifest_map m;
 
-  N(app.db.revision_exists(ident),
-    F("no revision %s found in database") % ident);
-
   app.db.get_revision_manifest(ident, mid);
   put_revision_id(ident);
 
--- tests/t_netsync_defaults.at
+++ tests/t_netsync_defaults.at
@@ -35,7 +35,7 @@
 AT_CHECK(test -f testdir2/testfile)
 
 # And finally, 
-AT_CHECK(MONOTONE2 set database default-server 127.0.0.1:5555, [], [ignore], [ignore])
+AT_CHECK(MONOTONE2 set database default-server 127.0.0.1:$_PORT, [], [ignore], [ignore])
 AT_CHECK(MONOTONE2 set database default-collection thirdbranch, [], [ignore], [ignore])
 AT_CHECK(MONOTONE2 sync, [], [ignore], [ignore])
 AT_CHECK(MONOTONE2 checkout --branch=thirdbranch $THIRDBRANCH_R testdir3, [], [ignore], [ignore])
--- tests/t_netsync_single.at
+++ tests/t_netsync_single.at
@@ -24,9 +24,9 @@
 VER0=`BASE_REVISION`
 
 NETSYNC_KILLHARD
-         MONOTONE --rcfile=netsync.lua               serve 127.0.0.1:5555 testbranch &
+         MONOTONE --rcfile=netsync.lua               serve 127.0.0.1:$_PORT testbranch &
 sleep 5
-AT_CHECK(MONOTONE --rcfile=netsync.lua --db=test2.db pull 127.0.0.1:5555 testbranch, [], [ignore], [ignore])
+AT_CHECK(MONOTONE --rcfile=netsync.lua --db=test2.db pull 127.0.0.1:$_PORT testbranch, [], [ignore], [ignore])
 NETSYNC_KILLHARD
 
 AT_CHECK(MONOTONE --db=test2.db ls certs $VER0, [], [stdout])