Mercurial > hgsubversion

annotate Makefile @ 920:1be4ea4f3c0d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stupid: diff with the good revision when restoring branch Converting history like: r1 create trunk r2 remove trunk r3 make some unrelated commit r4 restore trunk from r2 stupid mode would retrieve and apply the diff with r3 instead of the one with r2. All the code deciding r2 is the actual parent was already there, only the revision argument was not passed. This fixes: - test_delete_restore_trunk in comprehensive/test_stupid_pull.py - test_delete_restore_trunk_stupid in comprehensive/test_verify_and_startrev.py Tested on OSX 10.6 with macports svn-1.7.5. I can no longer test with svn-1.6.
author Patrick Mezard <patrick@mezard.eu>
date Sun, 29 Jul 2012 13:13:56 +0200
parents 055f9254d790
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
683
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
1 # Makefile for testing hgsubversion
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
2
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
3 PYTHON=python
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
4
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
5 .PHONY: all check check-demandimport check-subvertpy check-swig
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
6
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
7 all:
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
8 @echo "Use the following commands to build and install hgsubversion:"
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
9 @echo
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
10 @echo "$$ cd $(PWD)"
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
11 @echo "$$ $(PYTHON) ./setup.py install"
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
12 @echo
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
13 @exit 1
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
14
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
15 check: check-demandimport check-subvertpy check-swig
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
16
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
17 check-demandimport:
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
18 # verify that hgsubversion loads properly without bindings, but fails
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
19 # when actually used
879
055f9254d790 Makefile: set HGRCPATH to protects us from broken environments
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 683
diff changeset
20 ! LC_ALL=C HGSUBVERSION_BINDINGS=none HGRCPATH=/dev/null \
683
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
21 hg --config extensions.hgsubversion=./hgsubversion \
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
22 version 2>&1 \
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
23 | egrep '(^abort:|failed to import extension)'
879
055f9254d790 Makefile: set HGRCPATH to protects us from broken environments
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 683
diff changeset
24 LC_ALL=C HGSUBVERSION_BINDINGS=none HGRCPATH=/dev/null \
683
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
25 hg --config extensions.hgsubversion=./hgsubversion \
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
26 version --svn 2>&1 \
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
27 | egrep '(^abort:|failed to import extension)'
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
28
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
29 check-subvertpy:
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
30 $(PYTHON) tests/run.py --all --bindings=subvertpy
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
31
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
32 check-swig:
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
33 $(PYTHON) tests/run.py --all --bindings=swig