Correct printing of line numbers when includes are used. Closes: #650952

[code/myrepos.git] / lib / unison

diff --git a/lib/unison b/lib/unison
index abe9584e6a247570d50f083c35fd1d550a6cb4d1..ffe5205d436820a613a983ad014e0be424f8ebbf 100644 (file)
--- a/lib/unison
+++ b/lib/unison
@@ -1,4 +1,4 @@
-# This allows using unison as a "revison control system" with mr.
+# This allows using unison as a "version control system" with mr.

 # 
 # You need to configure unison by setting up files in ~/.unison named
 # the same as the basenames of the directories you want to sync, and
 # 
 # You need to configure unison by setting up files in ~/.unison named
 # the same as the basenames of the directories you want to sync, and


@@ -15,6 +15,7 @@
 # And an example repo using it would look something like:
 #[music]
 #unison_test = true
 # And an example repo using it would look something like:
 #[music]
 #unison_test = true

+#checkout = unison_checkout music

 
 lib =
        # The name of the directory containing the repo is assumed to
 
 lib =
        # The name of the directory containing the repo is assumed to


@@ -22,10 +23,15 @@ lib =
        unison_config() {
                basename "$MR_REPO"
        }
        unison_config() {
                basename "$MR_REPO"
        }

+       unison_batch() {
+               unison -batch $(unison_config)
+       }
+       unison_checkout() {
+               mkdir "$1" && cd "$1" && unison -batch "$1"
+       }

 
 

-unison_checkout = unison -batch $(unison_config)
-unison_update   = unison -batch $(unison_config)
-unison_push     = unison -batch $(unison_config)
+unison_update   = unison_batch
+unison_push     = unison_batch

 unison_commit   = unison $(unison_config)
 
 # vim:sw=8:sts=0:ts=8:noet
 unison_commit   = unison $(unison_config)
 
 # vim:sw=8:sts=0:ts=8:noet