]> git.madduck.net Git - code/myrepos.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

* Improve unison support.
authorJoey Hess <joey@kodama.kitenet.net>
Thu, 3 Jan 2008 03:56:10 +0000 (22:56 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Thu, 3 Jan 2008 03:56:10 +0000 (22:56 -0500)
debian/changelog
lib/unison

index cca62ecefd4285cef461cff7b56beb19b011c0e3..9f4729f0ae0e8e7383fec037299657f420738d07 100644 (file)
@@ -1,11 +1,12 @@
-mr (0.20) UNRELEASED; urgency=low
+mr (0.20) unstable; urgency=low
 
   * Add -q flag.
   * darcs: Add -u to diff to get a more usual unified diff.
   * Add a "record" subcommand, borrowing termonology from darcs. This does a
     local commit, but does not push changes to remote repos.
 
   * Add -q flag.
   * darcs: Add -u to diff to get a more usual unified diff.
   * Add a "record" subcommand, borrowing termonology from darcs. This does a
     local commit, but does not push changes to remote repos.
+  * Improve unison support.
 
 
- -- Joey Hess <joeyh@debian.org>  Sat, 22 Dec 2007 13:53:31 -0500
+ -- Joey Hess <joeyh@debian.org>  Wed, 02 Jan 2008 22:49:53 -0500
 
 mr (0.19) unstable; urgency=low
 
 
 mr (0.19) unstable; urgency=low
 
index abe9584e6a247570d50f083c35fd1d550a6cb4d1..d2a784f81dcf56b41b121d68b3d3574eab04ff85 100644 (file)
@@ -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