[Unison-hackers] a common patch set - first attempt

[Zvezdan Petkovic]

On Mon, May 30, 2005 at 10:21:11PM -0400, Andrew Schulman wrote:
> I've put together a first attempt at a standard set of patches for 
> Unison versions 2.9.1, 2.9.20, 2.10.2, and 2.12.0.  The draft page is 
> at http://home.comcast.net/~andrex/unison/patches.html.  Please have a 
> look at the page, and send me your comments.

Very nice!

> The patches listed on the page reflect the recent discussions on 
> unison-hackers and unison-users, as well as I've been able to follow 
> them, up through today.  The discussion was long and there are a lot of 
> patches, so it's likely that I've gotten some details wrong or missed 
> some things.  Please check the patches and let me know if you find any 
> problems.

Stable 2.10.2 looks OK.
I compared it to my patches in OpenBSD CVS repository
http://www.openbsd.org/cgi-bin/cvsweb/ports/net/unison/stable/patches/

For beta version 2.12.0 you are missing the patch that fixes the order
of checking for the home directory on Windows.
I sent it to the list, after Jérôme's comment that your patch was
correct (for stable version) and it was wrong in 2.12.0.
Jérôme has committed it to subversion for the main branch the day before
yesterday I believe (see the comments for the commit).

See the bottom of patch-ubase_util_ml in the OpenBSD CVS repository 
http://www.openbsd.org/cgi-bin/cvsweb/ports/net/unison/snapshot/patches/
for the patch and a link to the unison-hackers message.

I probably need to explain why are my patches by file, rather than by
the patch date.  The reason is the port system on OpenBSD.
I patch the source file.ml, saving the original file as file.ml.orig.
Then in the main port directory I just type

	make update-patches

and all the patches you see in CVS get updated (or created if new) in
the patches subdirectory of the port.

There are obvious advantages to the one patch per file approach for the
automatic processing.  I like the flexibility of the port system, but
one consequence is that two patches for the same file are put together,
or one patch is distributed over several file patches.
I use comments to indicate the patch sources.

This property of OpenBSD port patches shouldn't be an obstacle I hope.

> Notes on specific patches:  The OSX client patch 
> (http://lists.seas.upenn.edu/pipermail/unison-hackers/2005-May/000071.html) 
> conflicts with Jérôme's later file properties patch 
> (http://lists.seas.upenn.edu/pipermail/unison-hackers/2005-May/000090.html).  
> I'm using only the later one, on the assumption that Jérôme revised and 
> rereleased it.  Also I named one patch "osx-unknown" because its purpose 
> was never stated.

That is correct.

> I've jumped the gun on the page by saying that "The patches listed here 
> represent the consensus of the Unison developers and the packagers for 
> Cygwin, OpenBSD, and Windows."  This isn't true yet, but I would like 
> for it to be.  So in particular, Benjamin, Jerome, Max, and Zvezdan, 
> I'd like to have each of you review the list of patches, and let me 
> know if you can agree to it.  If you can't, then please tell us what 
> your issues are and let's try to address them.

This definitely is a consensus between you and me at least. :-)
I searched through the mail lists and used your Cygwin patches.
Thus, we have an essentially same patch set, and I definitely do not
mind that you mentioned it on the web page.

By nature of OpenBSD port system all my patches end up in CVS, which is
another good reference point.  That is the best we can do without a
developer controlled patch repository.

Best regards,

	Zvezdan Petkovic