aboutsummaryrefslogtreecommitdiff
path: root/t/manual/git_revert
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2016-12-19 15:33:28 +0000
committerSimon McVittie <smcv@debian.org>2016-12-19 18:21:07 +0000
commitda395ac33cec337edcbaccd3c8631a948f029155 (patch)
treead2595a61b2fb4fe1c2d844a784957d4aa5367ce /t/manual/git_revert
parent9cada49ed6ad24556dbe9861ad5b0a9f526167f9 (diff)
downloadikiwiki-da395ac33cec337edcbaccd3c8631a948f029155.tar
ikiwiki-da395ac33cec337edcbaccd3c8631a948f029155.tar.gz
Add a manual test for reverting git commits
Signed-off-by: Simon McVittie <smcv@debian.org>
Diffstat (limited to 't/manual/git_revert')
-rw-r--r--t/manual/git_revert/Makefile26
-rw-r--r--t/manual/git_revert/index.mdwn8
2 files changed, 34 insertions, 0 deletions
diff --git a/t/manual/git_revert/Makefile b/t/manual/git_revert/Makefile
new file mode 100644
index 000000000..9e2220d11
--- /dev/null
+++ b/t/manual/git_revert/Makefile
@@ -0,0 +1,26 @@
+export PERL5LIB=$(CURDIR)/../../..
+ikiwiki = $(CURDIR)/../../../ikiwiki.in
+
+all:
+ rm -fr git html
+ mkdir -p git
+ echo "/doc/.ikiwiki/" > git/.gitignore
+ mkdir -p git/doc
+ mkdir -p git/doc/writable
+ cd git && git init
+ cp index.mdwn git/doc/index.mdwn
+ echo "This is the first test page" > git/doc/writable/one.mdwn
+ echo "This is the second test page" > git/doc/writable/two.mdwn
+ cd git && git add doc && git commit -m 'Initial commit'
+ $(ikiwiki) --setup ikiwiki.setup
+ echo "This is the first test page, it was first" > git/doc/writable/one.mdwn
+ cd git && git add doc && git commit -m 'First web commit'
+ $(ikiwiki) --setup ikiwiki.setup
+ echo "This is the second test page, it came second" > git/doc/writable/two.mdwn
+ cd git && git add doc && git commit -m 'Second web commit'
+ $(ikiwiki) --setup ikiwiki.setup
+ cd git && git mv doc/writable/one.mdwn doc/one.mdwn
+ cd git && git mv doc/writable/two.mdwn two.mdwn
+ cd git && git commit -m Rename
+ $(ikiwiki) --setup ikiwiki.setup
+ w3m html/index.html
diff --git a/t/manual/git_revert/index.mdwn b/t/manual/git_revert/index.mdwn
new file mode 100644
index 000000000..41c063aa7
--- /dev/null
+++ b/t/manual/git_revert/index.mdwn
@@ -0,0 +1,8 @@
+== Git revert manual test instructions ==
+
+* Look at the recent changes, below, in w3m
+* Try to revert each of the two web commits
+* Expected result: both fail
+
+[[!inline pages="internal(recentchanges/change_*) and !*/Discussion"
+template=recentchanges show=0]]