Mercurial > hgsubversion
view tests/fixtures/truncatedhistory.svndump @ 1170:61d4fb78370b stable
pull: fix pull when phases.new-commit=secret
This was causing subtle failures during pull. I believe the line where
we manually "set phase to public" isn't required any more, but more
work is required to verify that behavior on all versions of hg, so
we'll do that as a followup on default if needed.
| author | Augie Fackler <raf@durin42.com> |
|---|---|
| date | Fri, 04 Apr 2014 21:27:55 -0400 |
| parents | 3b60f223893a |
| children |
line wrap: on
line source
SVN-fs-dump-format-version: 2 UUID: a632509c-657a-43d2-ae0b-85387476b20e Revision-number: 0 Prop-content-length: 56 Content-length: 56 K 8 svn:date V 27 2008-11-11T19:00:25.260082Z PROPS-END Revision-number: 1 Prop-content-length: 114 Content-length: 114 K 7 svn:log V 12 init project K 10 svn:author V 7 pmezard K 8 svn:date V 27 2008-11-11T19:00:25.322759Z PROPS-END Node-path: project1 Node-kind: dir Node-action: add Prop-content-length: 10 Content-length: 10 PROPS-END Node-path: project2 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 5 add a K 10 svn:author V 7 pmezard K 8 svn:date V 27 2008-11-11T19:00:26.173269Z PROPS-END Node-path: project1/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: 117 Content-length: 117 K 7 svn:log V 15 rename project1 K 10 svn:author V 7 pmezard K 8 svn:date V 27 2008-11-11T19:00:29.152593Z PROPS-END Node-path: project2/trunk Node-kind: dir Node-action: add Node-copyfrom-rev: 2 Node-copyfrom-path: project1 Prop-content-length: 34 Content-length: 34 K 13 svn:mergeinfo V 0 PROPS-END Node-path: project1 Node-action: delete Revision-number: 4 Prop-content-length: 106 Content-length: 106 K 7 svn:log V 5 add b K 10 svn:author V 7 pmezard K 8 svn:date V 27 2008-11-11T19:00:30.178261Z PROPS-END Node-path: project2/trunk/b Node-kind: file Node-action: add Prop-content-length: 10 Text-content-length: 2 Text-content-md5: 3b5d5c3712955042212316173ccf37be Content-length: 12 PROPS-END b