merge: short-circuit search for merge into empty repo -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge: short-circuit search for merge into empty repo We should have 3 cases for merge: - - we have no changesets - - we have less than half the changesets - - we have more than half the changesets For no changesets, we can immediately tell that we need everything. This happens when we initially branch from a remote repo, so we simply shortcircuit the search and grab everything from the root When we're actually tracking a project, we should generally have most of the changesets, so the current search algorithm should minimize searching. It should rarely occur that upstreams gets far ahead of us, in which case, we suffer a longer search. manifest hash: eabd55841b03225176ea72b985aad36431a438a9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCmfajywK+sNU5EO8RAuyKAKCf7Nw6XSK5HEzbrZae7Q06e3dk4wCgjbK6 YUTEfkpPP1h3mNHIHRKz+aI= =eGMq -----END PGP SIGNATURE-----

     1

Files in this directory:

     2

     3

README - this file

     4

hg.1.txt - asciidoc source for the files

     5

hg.1 - groff man page for hg

     6

hg.1.html - man page in html format

     7

     8

How to generate the man page and html files

     9

    10

For now we use asciidoc which is available at:

    11

    12

http://www.methods.co.nz/asciidoc/

    13

    14

the file hg.1.txt is the input file, to generate the man page:

    15

    16

asciidoc.py -d manpage -b docbook hg.1.txt

    17

xmlto man hg.1.xml

    18

    19

to display:

    20

    21

groff -mandoc -Tascii hg.1 | more

    22

    23

to create the html page (without stylesheets):

    24

    25

asciidoc.py -b html hg.1.txt