touch: prompt the user for what to do with the revived changeset This patch improves our interface for reviving changesets. This patch makes touch not assume that the user wants to create divergence by default and gives a prompt instead. The prompt is skipped for changeset that have no living successor as no divergence would be created by reviving them anyway. To restore the previous behavior, one should now use the --allowdivergence flag. The prompt looks like: [10] <description> reviving this changeset will create divergence unless you make a duplicate. (a)llow divergence or (d)uplicate the changeset? a In further patches we will want to add one more choice to that prompt, for example having a marker between the old and revived nodes but no divergence displayed on the UI.

     1

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

     2

     3

     4

help:

     5

	@echo 'Commonly used make targets:'

     6

	@echo '  tests              - run all tests in the automatic test suite'

     7

	@echo '  all-version-tests - run all tests against many hg versions'

     8

	@echo '  tests-%s           - run all tests in the specified hg version'

     9

    10

all: help

    11

    12

deb-prepare:

    13

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

    14

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

    15

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

    16

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

    17

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

    18

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

    19

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