[PATCH 0 of 6] Build documentation using distutils - v3

Martin Geisler mg at lazybytes.net
Thu Nov 26 17:33:11 CST 2009


Dan Villiom Podlaski Christiansen <danchr at gmail.com> writes:

> On 26 Nov 2009, at 23:00, Mads Kiilerich wrote:
>
>> Dan Villiom Podlaski Christiansen wrote, On 11/26/2009 08:48 PM:
>>> This is an updated version of my distutils-docutils-marriage
>>> patch. The primary changes are:
>> 
>> It doesn't apply cleanly to crew default - what should it be applied
>> to?
>> 
>> applying setup_install_translation_files_as_package_data
>> applying setup_expand_configuration_variables_in_data_paths
>> applying setup_add_missing_share_directory_to_install_data_on_unix_platforms
>> applying setup_install_some_useful_data_files
>> applying setup_generate_build__install_documentation_using_distutils__docutils
>> patching file doc/Makefile
>> Hunk #1 FAILED at 0
>> 1 out of 1 hunks FAILED -- saving rejects to file doc/Makefile.rej
>
> I just updated to crew tip, and it still applies just fine here. What
> are you using to patch the file? The failing hunk is simply a deletion
> of the file, so it should be unlikely to fail if you are patching with
> Mercurial.

It fails if what your patch deletes is different from what is in crew
tip. The patch deletes these lines:

  -%: %.txt common.txt
  -	$(PYTHON) rst2man.py --halt warning \
  -	  --strip-elements-with-class htmlonly \
  -	  $< $@

and the Makefile in crew tip (5e4ef56b4d42) looks like this:

  %: %.txt common.txt
          $(PYTHON) rst2man.py --halt warning \
            --strip-elements-with-class htmlonly $*.txt $*

So the patch has not been prepared (rebased?) properly to crew tip. I
searched a bit but was unable to find the revision where doc/Makefile
looks like your patch expects it to look like.

> Please note that the patches are in Git format.

That is actually detected automatically, so it should't matter here. The
diff.git setting is only important for producing patches.

-- 
Martin Geisler

VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
SMPC (Secure Multiparty Computation) to Python. See: http://viff.dk/.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20091127/6650752c/attachment.pgp>


More information about the Mercurial-devel mailing list