Mercurial > hg
comparison tests/test-convert-svn-branches.out @ 7476:6644c111f9e9
convert: backout a7492fb2107b
This change is brain damaged, there is no reason the copyfrom revision of the
project items may have any relevance when deciding the revision parent. It is
meaningful only when fetching files content.
Incorrect converted graph was spotted in pyglet svn repository at:
------------------------------------------------------------------------
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 | Sat, 06 Dec 2008 20:10:31 +0100 |
parents | 90d8dfb481e7 |
children | 29f4f0d66cd5 |
comparison
equal
deleted
inserted
replaced
7475:90d8dfb481e7 | 7476:6644c111f9e9 |
---|---|
35 | | | | 35 | | | |
36 | | o branch=old 4 change b files: b | 36 | | o branch=old 4 change b files: b |
37 | | | | 37 | | | |
38 | o | branch= 3 change a files: a | 38 | o | branch= 3 change a files: a |
39 | | | | 39 | | | |
40 | | o branch=old 2 branch trunk, remove c files: | 40 +---o branch=old 2 branch trunk, remove c files: a b |
41 | |/ | 41 | | |
42 | o branch= 1 hello files: a b c | 42 | o branch= 1 hello files: a b c |
43 |/ | 43 |/ |
44 o branch= 0 init projA files: | 44 o branch= 0 init projA files: |
45 | 45 |
46 old3 11: | 46 old3 11: |