Mercurial > hgsubversion
view tests/fixtures/test_files_copied_from_outside_btt.svndump @ 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 | 496c0354019c |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: df2126f7-00ab-4d49-b42c-7e981dde0bcf Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2008-10-07T22:49:12.059692Z PROPS-END Revision-number: 1 Prop-content-length: 111 Content-length: 111 K 7 svn:log V 11 Empty dirs. K 10 svn:author V 5 durin K 8 svn:date V 27 2008-10-07T22:49:41.118037Z PROPS-END Node-path: branches Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: tags Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: trunk Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Revision-number: 2 Prop-content-length: 108 Content-length: 108 K 7 svn:log V 9 Add alpha K 10 svn:author V 5 durin K 8 svn:date V 27 2008-10-07T23:23:02.991743Z PROPS-END Node-path: trunk/alpha Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 12 Text-content-md5: 3c72ebf8bbd7fa88b1fdcee5398b5a17 Content-length: 22 PROPS-END file: alpha Revision-number: 3 Prop-content-length: 115 Content-length: 115 K 7 svn:log V 15 Add third_party K 10 svn:author V 5 durin K 8 svn:date V 27 2008-10-27T03:16:13.831333Z PROPS-END Node-path: third_party Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: third_party/magic Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: third_party/magic/the_magic_software Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 7 Text-content-md5: bc82cb068ef102a1f4e296992e5979ef Content-length: 17 PROPS-END magic! Revision-number: 4 Prop-content-length: 131 Content-length: 131 K 7 svn:log V 31 Copy magic in from third_party. K 10 svn:author V 5 durin K 8 svn:date V 27 2008-10-27T03:16:32.737023Z PROPS-END Node-path: trunk/magic Node-kind: dir Node-action: add Node-copyfrom-rev: 3 Node-copyfrom-path: third_party/magic Prop-content-length: 34 Content-length: 34 K 13 svn:mergeinfo V 0 PROPS-END