[Python-apps-team] Mercurial Debian patches applied upstream

[Javi Merino]

On 03/07/10 11:06, Faheem Mitha wrote:
> 
> Dear Debian Mercurial Maintainers,
> 
> These patches, mostly corresponding to patches from
> http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/debian/patches/
> were imported into mercurial crew.
> 
> http://hg.intevation.org/mercurial/crew/rev/48e549d7c6ae
> 
> http://hg.intevation.org/mercurial/crew/rev/6bfb76cb8873
> 
> http://hg.intevation.org/mercurial/crew/rev/227b9f13db13 and
> http://hg.intevation.org/mercurial/crew/rev/594ca4c60d62
> 
> The first is not in stable, but the others are, which means they will be
> in 1.6.1, I guess. In general, the Mercurial developers want you to come
> forward if there are patches that you think should be applied upstream.
> (Though I don't speak for them.)

Yes, I agree that some of the patches that were there should have been
sent upstream before. Thanks for sending them :)

> BTW, I've recently built 1.6 with your packaging on Lenny. I had to
> adjust some of the patches. Do you want me to send you my changes?

I was doing that myself right now! can you check that your changed
patches are the same than the current version in the svn?

Cheers,
Javi (Vicho)

>                                                           Regards, Faheem.
> 
> ---------- Forwarded message ----------
> Date: Sat, 03 Jul 2010 02:17:31 +0200
> From: Martin Geisler <mg at lazybytes.net>
> To: Faheem Mitha <faheem at email.unc.edu>
> Cc: mercurial-devel at selenic.com
> Subject: Re: debian patches
> 
> Faheem Mitha <faheem at email.unc.edu> writes:
> 
>> Hi,
>>
>> There are some patches here from the Mercurial Debian maintainers.
>>
>> http://svn.debian.org/viewsvn/python-apps/packages/mercurial/trunk/debian/patches/
>>
>>
>> Maybe someone could take a look at the ones labelled upstream, and see
>> which could be reasonably merged?
> 
> I merged for_upstream__add_doc_url_in_example_files.patch and took a
> little bit from proposed_upstream__correct-zeroconf-doc.
> 
>> Maybe glance at the deb_specific ones too. For example,
>> deb_specific__mergetools looks quite innocuous.
> 
> Yeah, that one looks good.
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 262 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/python-apps-team/attachments/20100703/08337460/attachment.pgp>