Rev 6512: Script reproducing bug #1075213. in file:///home/vila/src/bzr/bugs/1072513-log-missing-revs/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/1072513-log-missing-revs/

------------------------------------------------------------
revno: 6512
revision-id: v.ladeuil+lp at free.fr-20121106204633-godj12yzdu8g97yc
parent: pqm at pqm.ubuntu.com-20120911090908-1xx05ree9c58y4in
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 1072513-log-missing-revs
timestamp: Tue 2012-11-06 21:46:33 +0100
message:
  Script reproducing bug #1075213.
-------------- next part --------------
=== added file 'bzrlib/tests/blackbox/log_bug_1072513.sh'
--- a/bzrlib/tests/blackbox/log_bug_1072513.sh	1970-01-01 00:00:00 +0000
+++ b/bzrlib/tests/blackbox/log_bug_1072513.sh	2012-11-06 20:46:33 +0000
@@ -0,0 +1,98 @@
+#!/bin/sh -e
+#bzr="/home/fullermd/src/bzr/bzr.dev/bzr --no-plugins --no-aliases"
+bzr="/usr/local/bin/bzr --no-plugins --no-aliases"
+
+if [ -d "test" ]; then
+	echo "test/ already exists"
+	exit
+fi
+
+mk_dir=true
+# [3]
+#mk_dir=false
+
+${bzr} init-repo test
+(
+	cd test
+
+	# First, create a branch with a rev
+	${bzr} init A
+	(
+		cd A
+		${bzr} ci --unchanged -m 'Init'
+	)
+
+	# Now work on a file
+	${bzr} branch A B
+	(
+		cd B
+
+		if $mk_dir; then
+			mkdir foo
+			echo bar > foo/bar
+		else
+			touch foo
+		fi
+
+		${bzr} add
+		${bzr} ci -m 'Create foo'
+	)
+
+	# Merge that
+	(
+		cd A
+		${bzr} merge ../B
+		${bzr} ci -m "Merge B:1"
+		if $mk_dir; then
+			echo baz > foo/bar
+		else
+			echo baz > foo
+		fi
+		${bzr} ci --unchanged -m 'Edit bar'
+		# [1]
+		${bzr} ci --unchanged -m 'Nada'
+	)
+
+	# Now make another branch from the start of A, and merge later stuff
+	# from A
+	${bzr} branch -r1 A C
+	(
+		cd C
+		# [1]
+		${bzr} ci --unchanged -m 'Nada'
+		${bzr} merge ../A
+		${bzr} ci -m 'Merge A:1'
+		# [1]
+		${bzr} ci --unchanged -m 'Nada'
+	)
+
+	# Make another change, and merge it into C
+	# [2]
+	(
+		#exit
+		cd A
+		${bzr} ci --unchanged -m 'Empty to force merge'
+
+		cd ../C
+		${bzr} merge ../A
+		${bzr} ci -m 'Merge A:2'
+	)
+
+	# Now land those changes back on A
+	(
+		cd A
+		# [1]
+		${bzr} ci --unchanged -m 'Nada'
+		${bzr} merge ../C
+		${bzr} ci -m "Merge C:1"
+		# [1]
+		${bzr} ci --unchanged -m 'Nada'
+	)
+
+	# Now see when foo was touched.
+	(
+		cd A
+		${bzr} log -n0 foo
+		#${bzr} log -n0 -v foo
+	)
+)