From: Frank Lichtenheld Date: Wed, 2 May 2007 00:43:14 +0000 (+0200) Subject: cvsserver: Handle re-added files correctly X-Git-Tag: v1.5.2-rc2~7^2~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a7da9adb1ff4e2a378fdb2eb486a83ee2d68c847 cvsserver: Handle re-added files correctly We can't unconditionally assign revision 1.1 to newly added files. In case the file did exist in the past and was deleted we need to honor the old revision number. Signed-off-by: Frank Lichtenheld Signed-off-by: Junio C Hamano --- diff --git a/git-cvsserver.perl b/git-cvsserver.perl index 25816c5a21..3501c1bc3a 100755 --- a/git-cvsserver.perl +++ b/git-cvsserver.perl @@ -2454,7 +2454,7 @@ sub update #$log->debug("ADDED $name"); $head->{$name} = { name => $name, - revision => 1, + revision => $head->{$name}{revision} ? $head->{$name}{revision}+1 : 1, filehash => $hash, commithash => $commit->{hash}, modified => $commit->{date},