view tests/fixtures/copybeforeclose.svndump @ 933:a9f315eae67c

push: use native rebase instead of our rebase wrapper Our rebase wrapper doesn't quite do the right thing with repect to a just-pushed revision. In particular, it will try to rebase the just-pushed revision on top of the version of that revision we just pulled down from svn. This will sometimes result in a local revision with an identical commit message as the revision from svn, but no file changes. This changes the rebase portion of the push command to instead use the native rebase with a revset that excludes the revision we just pushed to svn from the set to be rebased. It also moves to a single strip operation that removes all of the revisions based on a pre-push or partially pushed revision. This moves to a separate rebase and strip operation since we now need to strip revisions we are not rebasing.
author David Schleimer <dschleimer@fb.com>
date Mon, 24 Sep 2012 10:18:28 -0700
parents 1b9d004a8c0a
children
line wrap: on
line source

SVN-fs-dump-format-version: 2

UUID: 1e1f7d3f-4361-4205-84f8-c0d471d161d2

Revision-number: 0
Prop-content-length: 56
Content-length: 56

K 8
svn:date
V 27
2009-06-11T15:51:46.768965Z
PROPS-END

Revision-number: 1
Prop-content-length: 100
Content-length: 100

K 7
svn:log
V 3
btt
K 10
svn:author
V 3
djc
K 8
svn:date
V 27
2009-06-11T15:51:47.134555Z
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: 106
Content-length: 106

K 7
svn:log
V 9
Add file.
K 10
svn:author
V 3
djc
K 8
svn:date
V 27
2009-06-11T15:51:48.129578Z
PROPS-END

Node-path: trunk/a
Node-kind: file
Node-action: add
Prop-content-length: 10
Text-content-length: 2
Text-content-md5: 60b725f10c9c85c70d97880dfe8191b3
Content-length: 12

PROPS-END
a


Revision-number: 3
Prop-content-length: 104
Content-length: 104

K 7
svn:log
V 7
Branch.
K 10
svn:author
V 3
djc
K 8
svn:date
V 27
2009-06-11T15:51:51.120532Z
PROPS-END

Node-path: branches/test
Node-kind: dir
Node-action: add
Node-copyfrom-rev: 2
Node-copyfrom-path: trunk


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

K 7
svn:log
V 15
Move on branch.
K 10
svn:author
V 3
djc
K 8
svn:date
V 27
2009-06-11T15:51:54.124503Z
PROPS-END

Node-path: branches/test/b
Node-kind: file
Node-action: add
Node-copyfrom-rev: 3
Node-copyfrom-path: branches/test/a
Text-copy-source-md5: 60b725f10c9c85c70d97880dfe8191b3


Node-path: branches/test/a
Node-action: delete


Revision-number: 5
Prop-content-length: 111
Content-length: 111

K 7
svn:log
V 13
Close branch.
K 10
svn:author
V 3
djc
K 8
svn:date
V 27
2009-06-11T15:51:57.130547Z
PROPS-END

Node-path: branches/test
Node-action: delete