merge: remember rename copies and parents properly on commit record copies in dirstate even if rename was remote this lets us record it properly at commit teach checkfilemerge about copies, including merge cases pull old copy code out of commit extend rename-merge1 test to show file index

[patchbomb] prepend leading zeros in the "[PATCH N of M]" string Without this patch, if one tries to send a patch bomb with more than 9 patches, the resulting subjects are not easily alphabetically sortable. For example: ... [PATCH 9 of 10] [PATCH 10 of 10] This patch prepends as many leading zeros as necessary. E.g., [PATCH 09 of 10] or [PATCH 009 of 100]

merged now fully working base85 codec, though currently unused.

merge with upstream

Handle odd-sized base85 input and output

Put in backslash again, it was needed to disable an asciidoc macro. Backed out changeset c05b0cc6b1485bb240e118a2be9e1d52bb25fd65

Corrected typo in date format, found by Rob Landley.

Make test-bundle-r executable.

add -r/--rev and --base option to bundle --rev is used to specify a target rev (like pull or clone) --base REV is used to specify a base instead of a target repo the target repo is assumed to have all the rev specified in --base

Add a base85 codec