X-Recipient:	archive-cygwin AT delorie DOT com
X-SWARE-Spam-Status:	No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,TW_YG,T_RP_MATCHES_RCVD
X-Spam-Check-By:	sourceware.org
To:	cygwin AT cygwin DOT com
From:	Andrew Schulman <schulman DOT andrew AT epamail DOT epa DOT gov>
Subject:	Re: unison 2.40.16 (cygwin) over ssh doesn't resume after merge command
Date:	Fri, 01 Oct 2010 10:34:27 -0400
Lines:	32
Message-ID:	<d1rba691cprudrl556ddo6ig9pm5neoi10@4ax.com>
References:	<i847sl$otc$1 AT dough DOT gmane DOT org>
Mime-Version:	1.0
X-Archive:	encrypt
X-IsSubscribed:	yes
Mailing-List:	contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Id:	<cygwin.cygwin.com>
List-Subscribe:	<mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive:	<http://sourceware.org/ml/cygwin/>
List-Post:	<mailto:cygwin AT cygwin DOT com>
List-Help:	<mailto:cygwin-help AT cygwin DOT com>, <http://sourceware.org/ml/#faqs>
Sender:	cygwin-owner AT cygwin DOT com
Mail-Followup-To:	cygwin AT cygwin DOT com
Delivered-To:	mailing list cygwin AT cygwin DOT com

> Executive summary: unison 2.40.16 (cygwin) freezes upon exit of a merge 
> command, but only when one root is ssh.  Works fine when both are local.
> Testing the MSVC build of 2.40.16 also works fine with a ssh-root.

strace can probably help - you can see which system call is hanging, or
maybe looping forever.  There are people here who can help you to interpret
the output.

> Any hints are welcome!  As a last resort, I'll have to dive into 
> building unison on cygwin myself.

Should be straightforward to build.  The source package includes a cygport
script, and a couple of small patches (unison2.40-2.40.16-1.src.patch) that
are needed in order for Unison to build in Cygwin.  Also, since OCaml was
upgraded to 3.12.0 in Cygwin, the following additional small patch is
needed or the build will fail.  I'll issue a new release soon that includes
that patch, so people can still build it with OCaml 3.12.0.

Andrew.

diff -urN unison-2.40.16.orig/update.mli unison-2.40.16/update.mli
--- unison-2.40.16.orig/update.mli      2010-04-15 13:29:31.000000000 -0400
+++ unison-2.40.16/update.mli   2010-09-28 09:58:43.202167800 -0400
@@ -1,7 +1,7 @@
 (* Unison file synchronizer: src/update.mli *)
 (* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)

-module NameMap : Map.S with type key = Name.t
+module NameMap : MyMap.S with type key = Name.t

 type archive =
     ArchiveDir of Props.t * archive NameMap.t


--
Problem reports:       http://cygwin.com/problems.html
FAQ:                   http://cygwin.com/faq/
Documentation:         http://cygwin.com/docs.html
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple

- Raw text -