From 385be63126584558336f5483ad3821c3aecd5f60 Mon Sep 17 00:00:00 2001
From: Jeremy Ashkenas <jashkenas@gmail.com>
Date: Thu, 23 Dec 2010 22:22:34 -0800
Subject: [PATCH] disallowing --watch and --join together for the time being.

---
 lib/command.js     | 2 +-
 src/command.coffee | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/command.js b/lib/command.js
index b99c9dd089..c5e6bb2a14 100644
--- a/lib/command.js
+++ b/lib/command.js
@@ -83,7 +83,7 @@
                   return compileScript(source, code.toString(), base);
                 }
               });
-              if (opts.watch) {
+              if (opts.watch && !opts.join) {
                 return watch(source, base);
               }
             }
diff --git a/src/command.coffee b/src/command.coffee
index 6913186789..cade09bdde 100644
--- a/src/command.coffee
+++ b/src/command.coffee
@@ -89,7 +89,7 @@ compileScripts = ->
                 compileJoin() if helpers.compact(contents).length is sources.length
               else
                 compileScript(source, code.toString(), base)
-            watch source, base if opts.watch
+            watch source, base if opts.watch and not opts.join
     compile source, true
 
 # Compile a single source script, containing the given code, according to the