[Monotone-commits-diffs] net.venge.monotone: 83155202b010fec62428f5970acf40738930ff42

[code]

revision:            83155202b010fec62428f5970acf40738930ff42
date:                2012-07-23T09:03:06
author:              address@hidden
branch:              net.venge.monotone
changelog:
explicit merge of '05384f5da146ca691f35f19574b906b637d2c69a'
              and 'd6e8f82dc157a9aa5b10b2f11106067683e6f93d'



manifest:
format_version "1"

new_manifest [8ec3218f45aae59798768b2ab8dc037e1ef3fcb2]

old_revision [05384f5da146ca691f35f19574b906b637d2c69a]

patch "innosetup/README.txt"
 from [798ee75cb8be7728e4c5fbc6cb682d1f7beca7a2]
   to [6f92ce9f01c75b83994b690bb8b00c549c368965]

patch "innosetup/monotone.iss.in"
 from [1800543d08b166faa10b73a217b03c827733e710]
   to [ac82a895b5fb4de6b175e65cc99db7e233d7fa9b]

old_revision [d6e8f82dc157a9aa5b10b2f11106067683e6f93d]

patch "src/automate.cc"
 from [919e3df52514d0877aeafc67791aae6a3faa33b4]
   to [30e9bb3567e320f83ce5c1b4817dc9ad90fe8423]
============================================================
--- innosetup/README.txt	798ee75cb8be7728e4c5fbc6cb682d1f7beca7a2
+++ innosetup/README.txt	6f92ce9f01c75b83994b690bb8b00c549c368965
@@ -5,8 +5,9 @@
 Windows machine:
 
 Install Inno Setup and Inno Setup preprocessor; see
-http://www.jrsoftware.org/isinfo.php, isetup-5.4.3.exe. Install the
-preprocessor (we use it).
+http://www.jrsoftware.org/isinfo.php, isetup-5.5.1.exe. Install to a
+path that has no spaces in the name; simplifies later steps. Install
+the preprocessor (we use it).
 
 Install MinGW tools; see ../INSTALL_windows_native.txt
 
============================================================
--- innosetup/monotone.iss.in	1800543d08b166faa10b73a217b03c827733e710
+++ innosetup/monotone.iss.in	ac82a895b5fb4de6b175e65cc99db7e233d7fa9b
@@ -17,7 +17,7 @@ DefaultGroupName={#APPNAME}
 AppPublisherURL=http://www.monotone.ca/
 DefaultDirName={pf}\{#APPNAME}
 DefaultGroupName={#APPNAME}
-MinVersion=4.0,4.0
+MinVersion=0,5.0
 OutputDir=.
 AllowNoIcons=1
 Compression=lzma/ultra
============================================================
--- src/automate.cc	919e3df52514d0877aeafc67791aae6a3faa33b4
+++ src/automate.cc	30e9bb3567e320f83ce5c1b4817dc9ad90fe8423
@@ -1352,15 +1352,15 @@ CMD_AUTOMATE(get_base_revision_id, "",
   E(args.size() == 0, origin::user,
     F("no arguments needed"));
 
-  database db(app);
   workspace work(app);
+  revision_t rev;
 
-  parent_map parents;
-  work.get_parent_rosters(db, parents);
-  E(parents.size() == 1, origin::user,
+  work.get_work_rev(rev);
+
+  E(rev.edges.size() == 1, origin::user,
     F("this command can only be used in a single-parent workspace"));
 
-  output << parent_id(parents.begin()) << '\n';
+  output << rev.edges.begin()->first << '\n';
 }
 
 // Name: get_current_revision_id