fold: require --from flag for folding revisions to working copy It's very easy to think that "hg fold 4::6" will fold exactly those revisions. In reality, it will fold those *and* any revisions between them and the working copy. To prevent users from making that mistake, require the use of a new --from flag for folding revisions from the given set to the working copy. With this change, I'm sure some users will be surprised that the command can not be run without either --from or --exact, but at least the consequences will be smaller (the command simply aborts and the user can try again).

     1

VERSION=$(shell python setup.py --version)

     2

     3

     4

help:

     5

	@echo 'Commonly used make targets:'

     6

	@echo '  deb-prepare - prepare the build of a debian package'

     7

     8

all: help

     9

    10

deb-prepare:

    11

	python setup.py sdist --dist-dir ..

    12

	mv -f ../hg-evolve-$(VERSION).tar.gz ../mercurial-evolve_$(VERSION).orig.tar.gz

    13

	tar xf ../mercurial-evolve_$(VERSION).orig.tar.gz

    14

	rm -rf ../mercurial-evolve_$(VERSION).orig

    15

	mv hg-evolve-$(VERSION) ../mercurial-evolve_$(VERSION).orig

    16

	cp -r debian/ ../mercurial-evolve_$(VERSION).orig/

    17

	@cd ../mercurial-evolve_$(VERSION).orig && echo 'debian build directory ready at' `pwd`