view tests/fixtures/simple_branch.svndump @ 120:f508c1fa19a5

hg_delta_editor: do not assume branches are copied from trunk by default Here is what happen in jquery repository: - kelvin-dev branch is created in r1617 with an empty directory for the datePicker plugin - commits are done - datePicker plugin is merged in trunk Before the fix, the converter assumed the initial empty commit had for parent some other commit of trunk, therefore adding all its files, which was wrong. And we ended with 'alignDemo.html' in converted trunk@5946 while it was not in the source revision.
author Patrick Mezard <pmezard@gmail.com>
date Sat, 29 Nov 2008 11:25:01 -0600
parents db32dee803a8
children bb00f7ca5b8c
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: 107
Content-length: 107

K 7
svn:log
V 8
Add beta
K 10
svn:author
V 5
durin
K 8
svn:date
V 27
2008-10-07T23:28:22.651398Z
PROPS-END

Node-path: trunk/beta
Node-kind: file
Node-action: add
Prop-content-length: 10
Text-content-length: 13
Text-content-md5: 981d1eb5fd0bbe05354c292105944863
Content-length: 23

PROPS-END
Data of beta


Revision-number: 4
Prop-content-length: 113
Content-length: 113

K 7
svn:log
V 13
Make a branch
K 10
svn:author
V 5
durin
K 8
svn:date
V 27
2008-10-08T01:35:39.984789Z
PROPS-END

Node-path: branches/the_branch
Node-kind: dir
Node-action: add
Node-copyfrom-rev: 3
Node-copyfrom-path: trunk
Prop-content-length: 34
Content-length: 34

K 13
svn:mergeinfo
V 0

PROPS-END