add doCheckout() back

doPatch.go

@@ -56,6 +56,9 @@ func doPatch() error {
 		return nil
 	}
 
+	// always run dirty first
+	me.forge.CheckDirty()
+
 	// if no option is given to patch, list out the
 	// repos that have patches ready in them
 	found := findReposWithPatches()

main.go

@@ -90,14 +90,12 @@ func main() {
 		okExit("")
 	}
 
-	/*
-		if argv.Checkout != nil {
-			if err := doCheckout(); err != nil {
-				badExit(err)
-			}
-			okExit("")
+	if argv.Checkout != nil {
+		if err := doCheckout(); err != nil {
+			badExit(err)
 		}
-	*/
+		okExit("")
+	}
 
 	if argv.Build != "" {
 		if err := doBuild(); err != nil {
@@ -163,7 +161,7 @@ func main() {
 			}
 			okExit("master merge ok")
 		}
-		badExit(fmt.Errorf("merge what?"))
+		badExit(fmt.Errorf("You must choose which branch to merge to (devel or master)"))
 	}
 
 	if argv.Pull != nil {