---

yaml
---
r: 50958
b: refs/heads/try
c: 125cdf5
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
-refs/heads/try: dcc88699d8f36ab35cf6b498d9d924526432db26
+refs/heads/try: 125cdf52cd280ed8e82e02eedffa3dd8a0cbe42a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/RELEASES.txt

@@ -41,9 +41,6 @@ Version 0.6 (March 2013)
       * Pattern matching over vectors improved and expanded
       * `const` renamed to `static` to correspond to lifetime name,
         and make room for future `static mut` unsafe mutable globals.
-      * Replaced `#[deriving_eq]` with `#[deriving(Eq)]`
-      * `Clone` implementations can be automatically generated with
-        `#[deriving(Clone)]`
 
    * Semantic changes
       * Types with owned pointers or custom destructors move by default,

branches/try/configure

@@ -444,12 +444,13 @@ fi
 
 if [ ! -z "$CFG_PANDOC" ]
 then
-    PANDOC_VER_LINE=$(pandoc --version | grep '^pandoc ')
-    PANDOC_VER=${PANDOC_VER_LINE#pandoc }
-    PV_MAJOR_MINOR=${PANDOC_VER%.[0-9]*}
-    PV_MAJOR=${PV_MAJOR_MINOR%%[.][0-9]*}
-    PV_MINOR=${PV_MAJOR_MINOR#[0-9]*[.]}
-    PV_MINOR=${PV_MINOR%%[.][0-9]*}
+    PV_MAJOR_MINOR=$(pandoc --version | grep '^pandoc ' |
+        # extract the first 2 version fields, ignore everything else
+        sed 's/pandoc \([0-9]*\)\.\([0-9]*\).*/\1 \2/')
+
+    # these patterns are shell globs, *not* regexps
+    PV_MAJOR=${PV_MAJOR_MINOR% *}
+    PV_MINOR=${PV_MAJOR_MINOR#* }
     if [ "$PV_MAJOR" -lt "1" ] || [ "$PV_MINOR" -lt "8" ]
     then
 		step_msg "pandoc $PV_MAJOR.$PV_MINOR is too old. disabling"

branches/try/src/libcore/run.rs

@@ -182,7 +182,7 @@ fn with_dirp<T>(d: &Option<~str>,
  *
  * # Return value
  *
- * The process id
+ * The process's exit code
  */
 pub fn run_program(prog: &str, args: &[~str]) -> int {
     let pid = spawn_process(prog, args, &None, &None,