Mercurial > hgsubversion

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
130:c2a84d436202 131:4d42dbbb5127
1 #!/bin/sh
2 #
3 # Generate unorderedbranch.svndump
4 #
5
6 mkdir temp
7 cd temp
8
9 mkdir project-orig
10 cd project-orig
11 mkdir trunk
12 mkdir branches
13 cd ..
14
15 svnadmin create testrepo
16 svnurl=file://`pwd`/testrepo
17 svn import project-orig $svnurl -m "init project"
18
19 svn co $svnurl project
20 cd project/trunk
21 echo a > a
22 svn add a
23 svn ci -m "add a in trunk"
24 echo b > b
25 echo z > z
26 svn add b z
27 svn ci -m "add b and z in trunk"
28 svn up
29 cd ../branches
30 # Copy from trunk past revision. The converted used to take the last
31 # trunk revision as branch parent instead of the specified one.
32 svn cp -r 2 ../trunk branch
33 svn cp ../trunk/z branch
34 echo c > branch/c
35 svn add branch/c
36 svn ci -m 'branch and add c'
37 cd ../..
38
39 svnadmin dump testrepo > ../unorderedbranch.svndump