Hello community, here is the log from the commit of package unison checked in at Mon Jan 21 13:39:01 CET 2008. -------- --- unison/unison.changes 2007-11-28 15:15:40.000000000 +0100 +++ /mounts/work_src_done/STABLE/unison/unison.changes 2008-01-21 09:29:26.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Jan 21 09:28:20 CET 2008 - seife@suse.de + +- Updated to 2.27.57: + * only some minor bugfixes (mistriggering assertions etc) + * the patch vor bug 331513 is incorporated upstream + +------------------------------------------------------------------- Old: ---- unison-2.27.24-bug335153.diff unison-2.27.47-manual.html unison-2.27.47.tar.gz New: ---- unison-2.27.57-manual.html unison-2.27.57.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unison.spec ++++++ --- /var/tmp/diff_new_pack.i11081/_old 2008-01-21 13:38:50.000000000 +0100 +++ /var/tmp/diff_new_pack.i11081/_new 2008-01-21 13:38:50.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package unison (Version 2.27.47) +# spec file for package unison (Version 2.27.57) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -20,13 +20,12 @@ License: GPL v2 or later Group: Productivity/Networking/Other AutoReqProv: on -Version: 2.27.47 -Release: 29 +Version: 2.27.57 +Release: 1 Source0: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-%{version}.tar.gz Source1: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-%{version}-manual.html Source2: %name.desktop Source3: %name.png -Patch0: unison-2.27.24-bug335153.diff Url: http://www.cis.upenn.edu/~bcpierce/unison BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A file synchronization tool @@ -46,7 +45,6 @@ %prep %setup -q -%patch0 %build %ifarch s390 s390x @@ -79,25 +77,29 @@ %{_bindir}/%{name} %changelog -* Wed Nov 28 2007 - seife@suse.de +* Mon Jan 21 2008 seife@suse.de +- Updated to 2.27.57: + * only some minor bugfixes (mistriggering assertions etc) + * the patch vor bug 331513 is incorporated upstream +* Wed Nov 28 2007 seife@suse.de - add an application icon for unison (bug 309880) -* Thu Oct 25 2007 - seife@suse.de +* Thu Oct 25 2007 seife@suse.de - fix bug 331513 (one ":" too much in the profile) -* Sun Oct 07 2007 - tsieden@suse.de +* Sun Oct 07 2007 tsieden@suse.de - Updated to 2.27.47: * Major rewrite and cleanup of the whole Mac OS X graphical user interface by Craig Federighi. * Ignore all-whitespace lines in preference files * Small fix to ctime (non-)handling in update detection under windows with fastcheck. -* Fri Aug 24 2007 - tsieden@suse.de +* Fri Aug 24 2007 tsieden@suse.de - Updated to 2.27.29: * small bugfixes - mostly windows related -* Thu Aug 23 2007 - tsieden@suse.de +* Thu Aug 23 2007 tsieden@suse.de - fix build (BuildRequires lablgtk2-devel only if suse_version >1020) -* Fri May 25 2007 - ro@suse.de +* Fri May 25 2007 ro@suse.de - added lablgtk2-devel to buildreq -* Wed Apr 25 2007 - mhopf@suse.de +* Wed Apr 25 2007 mhopf@suse.de - Updated to 2.27.24: * Backup functionality completely rewritten, removing bugs. * Several savety improvements: mountpoint checks, big deletes, missing @@ -108,46 +110,46 @@ * Reversed diff arguments. * Many bugfixes (fastcheck + daylight saving time under windows, 32/64 bit cleanup, removing deadlocks, ...) -* Tue Apr 17 2007 - seife@suse.de +* Tue Apr 17 2007 seife@suse.de - add ncurses-devel to buildrequires, to fix build on s390 -* Wed Dec 13 2006 - mhopf@suse.de +* Wed Dec 13 2006 mhopf@suse.de - added patch for no longer closing main window if subwindows open - removed unison-gtk1 again -* Wed Dec 06 2006 - seife@suse.de +* Wed Dec 06 2006 seife@suse.de - add unison-gtk1, a binary compiled against lablgtk -* Mon Sep 25 2006 - mhopf@suse.de +* Mon Sep 25 2006 mhopf@suse.de - Update to version 2.17.1 - Completely rewritten backup function (actually working now) - Ip V6 support - Several bug fixes -* Thu Sep 21 2006 - seife@suse.de +* Thu Sep 21 2006 seife@suse.de - switch to GTK2 / lablgtk2 -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Mon Oct 10 2005 - rommel@suse.de +* Mon Oct 10 2005 rommel@suse.de - update to version 2.13.16 (includes all of our recent fixes) - updated spec file, manual is available in html now -* Tue Mar 15 2005 - ro@suse.de +* Tue Mar 15 2005 ro@suse.de - enable optimized compile on x86_64 -* Wed Sep 15 2004 - ro@suse.de +* Wed Sep 15 2004 ro@suse.de - fix build with ocaml-3.08 (from unison-hackers ml) -* Sat Jan 10 2004 - adrian@suse.de +* Sat Jan 10 2004 adrian@suse.de - build as user -* Fri Aug 15 2003 - adrian@suse.de +* Fri Aug 15 2003 adrian@suse.de - add desktop file -* Tue Jul 22 2003 - rommel@suse.de +* Tue Jul 22 2003 rommel@suse.de - fixed "invalid escape sequence" error messages - fixed %%install (not using make install anymore) - compiling with thread support -* Wed May 07 2003 - ro@suse.de +* Wed May 07 2003 ro@suse.de - fix tail calling syntax -* Mon Jan 27 2003 - rommel@suse.de +* Mon Jan 27 2003 rommel@suse.de - replaced pdf file (unreadable) with ps file -* Tue Sep 17 2002 - ro@suse.de +* Tue Sep 17 2002 ro@suse.de - removed bogus self-provides -* Tue May 28 2002 - ro@suse.de +* Tue May 28 2002 ro@suse.de - update to 2.9.1 makes it build with current ocaml -* Fri Sep 14 2001 - grimmer@suse.de +* Fri Sep 14 2001 grimmer@suse.de - Update to 2.7.7, which fixes the following bugs (since 2.7.1): * Fixed a silly bug that would reliably prevent the Unison @@ -155,8 +157,8 @@ * Bug fix (2.7.4): read the initial connection header one byte at a time, so that we don't block if the header is shorter than expected. -* Wed Aug 29 2001 - grimmer@suse.de +* Wed Aug 29 2001 grimmer@suse.de - Update to 2.7.1 (see the NEWS file for changes) - updated PDF manual to latest version -* Thu Aug 16 2001 - grimmer@suse.de +* Thu Aug 16 2001 grimmer@suse.de - Initial package for SuSE Linux (version 2.6.59) ++++++ unison-2.27.47.tar.gz -> unison-2.27.57.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unison-2.27.47/files.ml new/unison-2.27.57/files.ml --- old/unison-2.27.47/files.ml 2007-10-05 02:26:32.000000000 +0200 +++ new/unison-2.27.57/files.ml 2008-01-18 16:46:16.000000000 +0100 @@ -787,14 +787,18 @@ debug (fun () -> Util.msg "merge path %s between roots %s and %s\n" (Path.toString path) (root2string root1) (root2string root2)); + (* The following assumes root1 is always local: switch them if needed to make this so *) + let (root1,root2) = + match root1 with + (Local,fspath1) -> (root1,root2) + | _ -> (root2,root1) in + let (localPath1, (workingDirForMerge, basep), fspath1) = match root1 with (Local,fspath1) -> let localPath1 = Update.translatePathLocal fspath1 path in (localPath1, Fspath.findWorkingDir fspath1 localPath1, fspath1) - | _ -> assert false (* roots are sorted: first root is always local *) - (* FIX: I (JV) believe this assumption is wrong: roots are not sorted... *) - (* Sigh. Fixing this will require some restructuring of the following... *) in + | _ -> assert false in (* We're going to be doing a lot of copying, so let's define a shorthand that fixes most of the arguments to Copy.localfile *) @@ -811,10 +815,6 @@ (Osx.ressLength info.Fileinfo.osX.Osx.ressInfo) (Some id)) l in - (* These names should be automatically ignored! And probably we should use - names that will be recognized as temp by ordinary Unix programs -- e.g., - beginning with dot. Perhaps the update detection sweep should remove them - automatically. *) let working1 = Path.addPrefixToFinalName basep (tempName "merge1-") in let working2 = Path.addPrefixToFinalName basep (tempName "merge2-") in let workingarch = Path.addPrefixToFinalName basep (tempName "mergearch-") in @@ -825,7 +825,7 @@ let (desc1, fp1, ress1, desc2, fp2, ress2) = Common.fileInfos ui1 ui2 in Util.convertUnixErrorsToTransient "merging files" (fun () -> - (* Install finalizer (see below) in case we unwind the stack *) + (* Install finalizer (below) in case we unwind the stack *) Util.finalize (fun () -> (* Make local copies of the two replicas *) @@ -858,9 +858,7 @@ | NoUpdates, Updates (_, New) -> debug (fun () -> Util.msg "File is new, no current version will be searched"); None - | _ -> assert false - - in + | _ -> assert false in (* Make a local copy of the archive file (in case the merge program overwrites it and the program crashes before the call to the Stasher). *) @@ -948,8 +946,8 @@ mergeResultLog) then raise (Util.Transient ("Merge command canceled by the user")); - (* I think it's useful to be a bit verbose about what we're doing, but let's keep it easy to - switch this to debug-only later. *) + (* It's useful for now to be a bit verbose about what we're doing, but let's + keep it easy to switch this to debug-only in some later release... *) let say f = f() in (* Check which files got created by the merge command and do something appropriate @@ -1066,7 +1064,8 @@ copyBack workingDirForMerge working2 root2 path desc2 ui2 id >>= (fun () -> let arch_fspath = Fspath.concat workingDirForMerge workingarch in if (Sys.file_exists (Fspath.toString arch_fspath)) then begin - debug (fun () -> Util.msg "Updating unison archives to reflect results of merge\n"); + debug (fun () -> Util.msg "Updating unison archives for %s to reflect results of merge\n" + (Path.toString path)); if not (Stasher.shouldBackupCurrent path) then Util.msg "Warning: 'backupcurrent' is not set for path %s\n" (Path.toString path); let infoarch = Fileinfo.get false workingDirForMerge workingarch in diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unison-2.27.47/Makefile new/unison-2.27.57/Makefile --- old/unison-2.27.47/Makefile 2007-04-02 05:03:20.000000000 +0200 +++ new/unison-2.27.57/Makefile 2008-01-18 16:46:16.000000000 +0100 @@ -200,8 +200,8 @@ # For developers at Penn runtest: - $(MAKE) all NATIVE=false DEBUG=true - ./unison test + $(MAKE) all NATIVE=false DEBUG=true + ./unison test selftest: $(MAKE) all NATIVE=false DEBUG=true UISTYLE=text diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unison-2.27.47/mkProjectInfo.ml new/unison-2.27.57/mkProjectInfo.ml --- old/unison-2.27.47/mkProjectInfo.ml 2007-10-05 13:39:35.000000000 +0200 +++ new/unison-2.27.57/mkProjectInfo.ml 2008-01-19 16:04:13.000000000 +0100 @@ -42,7 +42,7 @@ (* ---------------------------------------------------------------------- *) (* You shouldn't need to edit below. *) -let revisionString = "$Rev: 254 $";; +let revisionString = "$Rev: 264 $";; let revision = Scanf.sscanf revisionString "$Rev: %d " (fun x -> x);; let pointVersion = revision - pointVersionOrigin;; @@ -63,3 +63,9 @@ + + + + + + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unison-2.27.47/NEWS new/unison-2.27.57/NEWS --- old/unison-2.27.47/NEWS 2007-10-05 13:41:46.000000000 +0200 +++ new/unison-2.27.57/NEWS 2008-01-19 16:23:05.000000000 +0100 @@ -1,10 +1,7 @@ -Changes in Version 2.27.47 +Changes in Version 2.27.57 Changes since 2.17: - * The Unison project now accepts donations via PayPal. If you'd like - to donate, you can find a link to the donation page on the Unison - home page (http://www.cis.upenn.edu/ bcpierce/unison/lists.html). * Major rewrite and cleanup of the whole Mac OS X graphical user interface by Craig Federighi. Thanks, Craig!!! * Several small fixes to the GTK2 UI to make it work better under @@ -12,6 +9,9 @@ * The backup functionality has been completely rewritten. The external interface has not changed, but numerous bugs, irregular behaviors, and cross-platform inconsistencies have been corrected. + * The Unison project now accepts donations via PayPal. You can find + a link to the donation page on the Unison home page + (http://www.cis.upenn.edu/ bcpierce/unison/lists.html). * Some important safety improvements: + Added a new mountpoint preference, which can be used to specify a path that must exist in both replicas at the end of diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unison-2.27.47/remote.ml new/unison-2.27.57/remote.ml --- old/unison-2.27.47/remote.ml 2007-04-02 05:03:20.000000000 +0200 +++ new/unison-2.27.57/remote.ml 2008-01-18 14:53:35.000000000 +0100 @@ -346,6 +346,8 @@ let safeMarshal marshalPayload tag data rem = let (rem', length) = marshalPayload data rem in let l = String.length tag in + assert (length > 0); (* tracking down an assert failure in receivePacket... *) + assert (l > 0); debugE (fun() -> let start = first_chars (min length 10) rem' in let start = if length > 10 then start ^ "..." else start in @@ -680,6 +682,7 @@ (* Create a client function and return it *) let client conn serverArgs = let id = newMsgId () in (* Message ID *) + assert (id >= 0); (* tracking down an assert failure in receivePacket... *) let request = (encodeInt id, 0, 4) :: marshalHeader (Request cmdName) (marshalArgs serverArgs []) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unison-2.27.47/stasher.ml new/unison-2.27.57/stasher.ml --- old/unison-2.27.47/stasher.ml 2007-04-07 23:30:12.000000000 +0200 +++ new/unison-2.27.57/stasher.ml 2008-01-18 16:46:16.000000000 +0100 @@ -135,7 +135,7 @@ "Exceptions to \\verb|backupcurrent|, like the \\verb|ignorenot| preference." let shouldBackupCurrent p = - (* BCP: removed [Apr 2007]: causes ALL mergeable files to be backed + (* BCP: removed next line [Apr 2007]: causes ALL mergeable files to be backed up, which is probably not what users want -- the backupcurrent switch should be used instead. Globals.shouldMerge p || *) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unison-2.27.47/strings.ml new/unison-2.27.57/strings.ml --- old/unison-2.27.47/strings.ml 2007-10-05 13:41:43.000000000 +0200 +++ new/unison-2.27.57/strings.ml 2008-01-19 16:23:01.000000000 +0100 @@ -4,7 +4,7 @@ let docs = ("about", ("About Unison", "Unison File Synchronizer\n\ - Version 2.27.47\n\ + Version 2.27.57\n\ \n\ \032 Unison is a file-synchronization tool for Unix and Windows. It allows\n\ \032 two replicas of a collection of files and directories to be stored on\n\ @@ -61,7 +61,7 @@ \032 Trevor Jim (http://www.research.att.com/~trevor/), Benjamin Pierce\n\ \032 (http://www.cis.upenn.edu/~bcpierce/), and J\233r\244me Vouillon\n\ \032 (http://www.pps.jussieu.fr/~vouillon/), with Alan Schmitt\n\ - \032 (http://www.inrialpes.fr/~aschmitt/), Malo Denielou, Zhe Yang\n\ + \032 (http://alan.petitepomme.net/), Malo Denielou, Zhe Yang\n\ \032 (http://www.brics.dk/~zheyang/), Sylvain Gommier, and Matthieu Goulay.\n\ \032 The Mac user interface was started by Trevor Jim and enormously\n\ \032 improved by Ben Willmore. Our implementation of the rsync\n\ @@ -2364,6 +2364,11 @@ ("ssh", ("Installing Ssh", "Installing Ssh\n\ \n\ + \032 Warning: These instructions may be out of date. More current\n\ + \032 information can be found the Unison Wiki\n\ + \032 (http://alliance.seas.upenn.edu/ bcpierce/wiki/index.php?n=Main.Unison\n\ + \032 FAQOSSpecific).\n\ + \n\ \032 Your local host will need just an ssh client; the remote host needs an\n\ \032 ssh server (or daemon), which is available on Unix systems. Unison is\n\ \032 known to work with ssh version 1.2.27 (Unix) and version 1.2.14\n\ @@ -2378,7 +2383,7 @@ \032 Many Windows implementations of ssh only provide graphical interfaces,\n\ \032 but Unison requires an ssh client that it can invoke with a\n\ \032 command-line interface. A suitable version of ssh can be installed as\n\ - \032 follows. (Warning: These instructions may be out of date.)\n\ + \032 follows.\n\ \032 1. Download an ssh executable.\n\ \032 Warning: there are many implementations and ports of ssh for\n\ \032 Windows, and not all of them will work with Unison. We have gotten\n\ @@ -2460,13 +2465,10 @@ \n\ ")) :: - ("news", ("Changes in Version 2.27.47", - "Changes in Version 2.27.47\n\ + ("news", ("Changes in Version 2.27.57", + "Changes in Version 2.27.57\n\ \n\ \032 Changes since 2.17:\n\ - \032 * The Unison project now accepts donations via PayPal. If you'd like\n\ - \032 to donate, you can find a link to the donation page on the Unison\n\ - \032 home page (http://www.cis.upenn.edu/ bcpierce/unison/lists.html).\n\ \032 * Major rewrite and cleanup of the whole Mac OS X graphical user\n\ \032 interface by Craig Federighi. Thanks, Craig!!!\n\ \032 * Several small fixes to the GTK2 UI to make it work better under\n\ @@ -2474,6 +2476,9 @@ \032 * The backup functionality has been completely rewritten. The\n\ \032 external interface has not changed, but numerous bugs, irregular\n\ \032 behaviors, and cross-platform inconsistencies have been corrected.\n\ + \032 * The Unison project now accepts donations via PayPal. You can find\n\ + \032 a link to the donation page on the Unison home page\n\ + \032 (http://www.cis.upenn.edu/ bcpierce/unison/lists.html).\n\ \032 * Some important safety improvements:\n\ \032 + Added a new mountpoint preference, which can be used to\n\ \032 specify a path that must exist in both replicas at the end of\n\ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unison-2.27.47/test.ml new/unison-2.27.57/test.ml --- old/unison-2.27.47/test.ml 2007-04-02 05:03:20.000000000 +0200 +++ new/unison-2.27.57/test.ml 2008-01-18 16:46:16.000000000 +0100 @@ -1,7 +1,7 @@ (* Unison file synchronizer: src/test.ml *) (* Copyright 1999-2007 (see COPYING for details) *) -let (>>=) = Lwt.(>>=) +let (>>=) = Lwt.(>>=) (* ---------------------------------------------------------------------- *) (* Utility functions *) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unison-2.27.47/uicommon.ml new/unison-2.27.57/uicommon.ml --- old/unison-2.27.47/uicommon.ml 2007-05-22 16:20:31.000000000 +0200 +++ new/unison-2.27.57/uicommon.ml 2008-01-18 16:46:16.000000000 +0100 @@ -116,7 +116,7 @@ ) let confirmmerge = - Prefs.createBool "confirmmerge" true + Prefs.createBool "confirmmerge" false "ask for confirmation before commiting results of a merge" ("Setting this preference causes both the text and graphical interfaces" ^ " to ask the user if the results of a merge command may be commited " diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unison-2.27.47/uigtk2.ml new/unison-2.27.57/uigtk2.ml --- old/unison-2.27.47/uigtk2.ml 2007-10-04 05:18:34.000000000 +0200 +++ new/unison-2.27.57/uigtk2.ml 2008-01-19 16:04:13.000000000 +0100 @@ -770,6 +770,7 @@ let file = fileE#text in let user = userE#text in let host = hostE#text in + let port = portE#text in match !varLocalRemote with `Local -> Clroot.clroot2string(Clroot.ConnectLocal(Some file)) @@ -778,7 +779,7 @@ Clroot.ConnectByShell((if !varLocalRemote=`SSH then "ssh" else "rsh"), host, (if user="" then None else Some user), - Some portE#text, + (if port="" then None else Some port), Some file)) | `SOCKET -> Clroot.clroot2string( @@ -1388,7 +1389,7 @@ in detailsWindow#misc#modify_font (Lazy.force fontMonospaceMediumPango); - detailsWindow#misc#set_size_chars ~height:3 ~width:104 (); + detailsWindow#misc#set_size_chars ~height:3 ~width:112 (); detailsWindow#misc#set_can_focus false; let showDetCommand () = let details = @@ -1793,9 +1794,11 @@ progressBarPulse := false; sync_action := None; displayGlobalProgress 0.; grSet grGo (Array.length !theState > 0); grSet grRestart true; - if dangerousPaths <> [] then begin - Prefs.set Globals.batch false; - Util.warn (Uicommon.dangerousPathMsg dangerousPaths) + if Prefs.read Globals.confirmBigDeletes then begin + if dangerousPaths <> [] then begin + Prefs.set Globals.batch false; + Util.warn (Uicommon.dangerousPathMsg dangerousPaths) + end; end; in @@ -1975,19 +1978,6 @@ grSet grRestart true end in - let loadProfile p = - debug (fun()-> Util.msg "Loading profile %s..." p); - Uicommon.initPrefs p displayWaitMessage getFirstRoot getSecondRoot - termInteract; - displayNewProfileLabel p; - setMainWindowColumnHeaders() - in - - let reloadProfile () = - match !Prefs.profileName with - None -> () - | Some(n) -> loadProfile n in - (********************************************************************* Quit button *********************************************************************) @@ -2024,8 +2014,7 @@ (actionBar#insert_button ~text:detectCmdName ~icon:((GMisc.image ~stock:`REFRESH ())#coerce) ~tooltip:"Check for updates" - ~callback: (fun () -> reloadProfile(); detectCmd()) - ()); + ~callback: detectCmd ()); (********************************************************************* Buttons for <--, M, -->, Skip @@ -2268,6 +2257,19 @@ Synchronization menu *********************************************************************) + let loadProfile p = + debug (fun()-> Util.msg "Loading profile %s..." p); + Uicommon.initPrefs p displayWaitMessage getFirstRoot getSecondRoot + termInteract; + displayNewProfileLabel p; + setMainWindowColumnHeaders() + in + + let reloadProfile () = + match !Prefs.profileName with + None -> () + | Some(n) -> loadProfile n in + grAdd grGo (fileMenu#add_image_item ~key:GdkKeysyms._g ~image:(GMisc.image ~stock:`EXECUTE ~icon_size:`MENU () :> GObj.widget) @@ -2311,7 +2313,10 @@ (String.concat ", " (Safelist.map (fun p -> "'"^(Path.toString p)^"'") failedpaths))); - Prefs.set Globals.paths failedpaths; detectCmd()) + Prefs.set Globals.paths failedpaths; + Prefs.set Globals.confirmBigDeletes false; + detectCmd(); + reloadProfile()) "Recheck unsynchronized items"); ignore (fileMenu#add_separator ()); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/unison-2.27.47/update.ml new/unison-2.27.57/update.ml --- old/unison-2.27.47/update.ml 2007-10-05 13:39:35.000000000 +0200 +++ new/unison-2.27.57/update.ml 2008-01-18 13:29:24.000000000 +0100 @@ -801,8 +801,11 @@ ["Please delete archive files as appropriate and try again."])))) else begin foundArchives := false; - Util.warn - ("No archive files were found for these roots. This can happen either\n" + let expectedRoots = + String.concat "\n\t" (Safelist.map root2string (Globals.rootsList ())) in + Util.warn + ("No archive files were found for these roots, whose canonical names are:\n\t" + ^ expectedRoots ^ "\nThis can happen either\n" ^ "because this is the first time you have synchronized these roots, \n" ^ "or because you have upgraded Unison to a new version with a different\n" ^ "archive format. \n\n" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org