You've already forked lazarus-ccr
fpsvnsync: another fix for using revision in svn copy command
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@643 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
@ -163,9 +163,15 @@ var
|
|||||||
if LogPath.Action in [caModify, caAdd] then begin
|
if LogPath.Action in [caModify, caAdd] then begin
|
||||||
SourceFile := FSourceWC + LogPath.Path;
|
SourceFile := FSourceWC + LogPath.Path;
|
||||||
if LogPath.CopyFromPath<>'' then begin
|
if LogPath.CopyFromPath<>'' then begin
|
||||||
|
if ExtractFileName(LogPath.CopyFromPath)=ExtractFileName(DestFile) then
|
||||||
|
// to prevent that svn complains that the target is not a directory
|
||||||
Command := format('copy "%1:s%2:s@%0:d" "%3:s"',
|
Command := format('copy "%1:s%2:s@%0:d" "%3:s"',
|
||||||
[LogPath.CopyFromRevision,
|
[LogPath.CopyFromRevision, DestRoot, LogPath.CopyFromPath,
|
||||||
DestRoot, LogPath.CopyFromPath, DestFile]);
|
ExtractFileDir(DestFile)])
|
||||||
|
else
|
||||||
|
Command := format('copy "%1:s%2:s@%0:d" "%3:s"',
|
||||||
|
[LogPath.CopyFromRevision, DestRoot,
|
||||||
|
LogPath.CopyFromPath, DestFile]);
|
||||||
writeln('svn '+ Command);
|
writeln('svn '+ Command);
|
||||||
ExecuteSvnCommand(Command);
|
ExecuteSvnCommand(Command);
|
||||||
end;
|
end;
|
||||||
|
Reference in New Issue
Block a user