Mercurial > hgsubversion
view tests/fixtures/unrelatedbranch.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 | ea65fe2b0856 |
children |
line wrap: on
line source
#!/bin/sh # # Generate unrelatedbranch.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" cd ../branches # Create an unrelated branch with another file. It used to lead the converter # to think branch1 was a copy of trunk, even without copy information. mkdir branch1 echo b > branch1/b svn add branch1 svn ci -m "add b in branch1" # Make a real branch too for comparison svn cp ../trunk branch2 echo b > branch2/b svn add branch2/b svn ci -m "add b to branch2" # Add a file in the branch root for fun echo c > c svn add c svn ci -m "add c in branches/" # Even update it echo c >> c svn ci -m "change c" cd ../.. svnadmin dump testrepo > ../unrelatedbranch.svndump