diff tests/fixtures/unorderedbranch.sh @ 131:4d42dbbb5127

hg_delta_editor: fix parent revision detection on branch copy Project items copyfrom revisions are irrelevant to parent revision detection, only the project one or those of its ancestors matter. Items copyfrom is useful when retrieving items content. Former code resulted in incorrect converted graph for pyglet repository, especially on the following revision: ------------------------------------------------------------------------ r274 | r1chardj0n3s | 2006-12-21 02:02:14 +0100 (Jeu, 21 Dec 2006) | 2 lines Changed paths: A /branches/richard-glx-version (from /trunk:269) M /branches/richard-glx-version/pyglet/window/xlib/__init__.py R /branches/richard-glx-version/tests/test.py (from /trunk/tests/test.py:270) R /branches/richard-glx-version/tools/info.py (from /trunk/tools/info.py:272) R /branches/richard-glx-version/website/get_involved.php (from /trunk/website/get_involved.php:273) Branching to horribly mangle GLX
author Patrick Mezard <pmezard@gmail.com>
date Wed, 10 Dec 2008 11:03:22 -0600
parents
children
line wrap: on
line diff
new file mode 100755
--- /dev/null
+++ b/tests/fixtures/unorderedbranch.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+#
+# Generate unorderedbranch.svndump
+#
+
+mkdir temp
+cd temp
+
+mkdir project-orig
+cd project-orig
+mkdir trunk
+mkdir branches
+cd ..
+
+svnadmin create testrepo
+svnurl=file://`pwd`/testrepo
+svn import project-orig $svnurl -m "init project"
+
+svn co $svnurl project
+cd project/trunk
+echo a > a
+svn add a
+svn ci -m "add a in trunk"
+echo b > b
+echo z > z
+svn add b z
+svn ci -m "add b and z in trunk"
+svn up
+cd ../branches
+# Copy from trunk past revision. The converted used to take the last
+# trunk revision as branch parent instead of the specified one.
+svn cp -r 2 ../trunk branch
+svn cp ../trunk/z branch
+echo c > branch/c
+svn add branch/c
+svn ci -m 'branch and add c'
+cd ../..
+
+svnadmin dump testrepo > ../unorderedbranch.svndump