Dukhat wrote:
Dirk wrote:
This complete merge step will also only merge "Add" and "Creates" All
other actions are parent or child actions only
Thanks. But what about "Move", can you have more than one parent/parent
pair?
I can answer that one myself:
ERROR -- Multiple chidl recs for parent MOVE rec '23194'
at vss2svn.pl line 622
ERROR -- Multiple chidl recs for parent MOVE rec '35029'
at vss2svn.pl line 622
ERROR -- Multiple chidl recs for parent MOVE rec '92670'
at vss2svn.pl line 622
Seems you can move things back and forth, and get multiple hits. This
will break in the SQL statement. Suggested change:
Index: vss2svn.pl
===================================================================
--- vss2svn.pl (revision 265)
+++ vss2svn.pl (working copy)
@@ -550,13 +550,13 @@
AND (ABS(? - timestamp) < 21600)
AND author = ?
ORDER BY
- timestamp
+ ABS(? - timestamp)
EOSQL
# timestamp test is within 21600 seconds equals 6 hours (allows for
# really bad Windows clocks, timezones, and WAN delays)
my $sth = $gCfg{dbh}->prepare($sql);
- $sth->execute( $parentdata, @{ $parentrec }{qw(physname actiontype
timestamp author)} );
+ $sth->execute( $parentdata, @{ $parentrec }{qw(physname actiontype
timestamp author timestamp)} );
return $sth->fetchall_arrayref( {} );
} # End GetChildRecs
This statement also needs to be corrected:
if (scalar @$childrecs > 1) {
&ThrowWarning("Multiple child recs for parent rec "
. "'$row->{action_id}'");
}
(The message is OK. The throw breaks everything, I think...)
I gather one should operate on the first element only, since that one is
closest in time.
_______________________________________________
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
