Hello Jon,
Rollback is actually the counterpart of Branching. When you branch, you
will create a new phyiscal file with a BranchFile record as the first
record. This one will note the old physical file, where we branched
from. To specify the point of the branch a new version is generated with
the RollBack action to specify, that we rolled back to the version of
the branched file. Our new phyiscal file will record version starting
from the RollBack point.
So actually Branching and RollBack is the same. The BranchFile is the
parents view and the RollBack is the childs view of the branch action.
I hoped that this "HASH(0xc428a34)" kind of errors silently went away.
But it seems, that this is the root of the problem. I have no idea,
where this comes from.
Can you look into your PhysicalAction.txt and search for the ActionID
just before the problematic line, e.g. 117427. Does they also show a
HASH value?
The problem is, that you don't have an entry in the physical element:
> <Action ActionId="RollBack">
> <SSName offset="0" type="file">ag.h</SSName>
> <Physical></Physical>
> <Parent>BUEAAAAA</Parent>
> </Action>
The Physical normally specifies, the branch target.
The Parent specifies the branch source. (I know parent is the wrong word
for this)
And UAGAAAAA is your project, where the new branch is stored.
The fact, that this information is missing, will lead to the following
problem in GetVssItemVersions.
> $tphysname = $action->{Physical} || $physname;
The phyiscal node is there, but it is empty. I expect, that the result
is a hash??
What about the following code?
> $tphysname = $action->{Physical};
> if (!defined ($action->{Physical}) || (ref($ref) eq 'HASH')) {
> $tphysname = $physname;
>}
Please search for the timestamp 924778572. plus/minus a few seconds.
this would be the corresponding child entry of your problematic record.
Does it exists?
Dirk
Jon W schrieb:
The revision 245 of the pin_handler branch is working great at first
glance. In fact, now we have history of the files all of the way back
to 1997. The original directory may be orphaned, but at least the
file history and diffs are available.
One issue that I'm noticing is that several files don't exist in the
converted repository. When looking at these files, they don't exist
after a "branch/rollback" action. For this file, the versioning goes
up to 15, but the conversion stops much sooner for that file.
PhysicalAction.txt
11276 BUEAAAAA 1 \N ADD ag.h 2
887844085 Bob 0 \N 1 AAAAAEUB 0
\N \N
14140 UAGAAAAA \N CGECAAAA SHARE ag.h 2
988985147 Ted 0 \N 2 AAAAAGAU 1
\N \N
14188 ZSSCAAAA \N CGECAAAA BRANCH ag.h 2
994931557 Annie 0 UAGAAAAA 3 AAAACSSZ
1 \N \N
117428 HASH(0xc428a34) \N UAGAAAAA BRANCH ag.h
2 924778572 Byrd 0 BUEAAAAA 3
)43a824cx0(HSAH 1 \N
155824 ZSSCAAAA 8 \N BRANCH ag.h 2
994931557 Annie 0 UAGAAAAA 3 AAAACSSZ
0 \N \N
VssAction.txt:
13525 _BUEAAAAA BUEAAAAA 1 ADD
/orphaned/_BUEAAAAA/ag.h 2 0 \N
13721 \N BUEAAAAA 2 COMMIT
/orphaned/_BUEAAAAA/ag.h 2 0 \N
14655 \N BUEAAAAA 3 COMMIT
/orphaned/_BUEAAAAA/ag.h 2 0 \N
15021 \N BUEAAAAA 4 COMMIT
/orphaned/_BUEAAAAA/ag.h 2 0 \N
16417 \N BUEAAAAA 5 COMMIT
/orphaned/_BUEAAAAA/ag.h 2 0 \N
The branch action from the datacache.PhysicalAction.txt that appears
to be odd is:
117428 HASH(0xc428a34) \N UAGAAAAA BRANCH ag.h
2 924778572 Byrd 0 BUEAAAAA 3
)43a824cx0(HSAH 1 \N
Using ssphys.exe to look at UAGAAAAA, shows that there was a
"rollback" command used with the branch. Is this causing all of the
problems?
<BranchFile offset="1116">
<BranchToPhys>ZSSCAAAA</BranchToPhys>
<PreviousOffset>0</PreviousOffset>
</BranchFile>
<Version offset="1140">
<Action ActionId="RollBack">
<SSName offset="0" type="file">ag.h</SSName>
<Physical></Physical>
<Parent>BUEAAAAA</Parent>
</Action>
<Date>924778572</Date>
<UserName>Byrd</UserName>
<VersionNumber>6</VersionNumber>
</Version>
<FileDelta offset="1552" />
<Version offset="1596">
<Action ActionId="CheckedIn">
<Offset>1552</Offset>
<CheckInSpec>$/Omega1/usercode</CheckInSpec>
</Action>
<Date>930498097</Date>
<UserName>Bob</UserName>
<VersionNumber>7</VersionNumber>
</Version>
Sorry if I missed hearing that rollback actions are not supported.
Thank you,
Jon
_______________________________________________
vss2svn-users mailing list
Project homepage:
http://www.pumacode.org/projects/vss2svn/
Subscribe/Unsubscribe/Admin:
http://lists.pumacode.org/mailman/listinfo/vss2svn-users-lists.pumacode.org
Mailing list web interface (with searchable archives):
http://dir.gmane.org/gmane.comp.version-control.subversion.vss2svn.user
_______________________________________________
vss2svn-users mailing list
Project homepage:
http://www.pumacode.org/projects/vss2svn/
Subscribe/Unsubscribe/Admin:
http://lists.pumacode.org/mailman/listinfo/vss2svn-users-lists.pumacode.org
Mailing list web interface (with searchable archives):
http://dir.gmane.org/gmane.comp.version-control.subversion.vss2svn.user
