diff options
| author | Matthew Ogilvie <mmogilvi_git@miniinfo.net> | 2012-10-14 09:42:21 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-17 03:16:26 +0400 |
| commit | ab07681fed75f3810f6c1fca526b763a88d2ba94 (patch) | |
| tree | b3b2a504859bc8c09caa533fa5b444c8fbe3c2f6 /t/t9400-git-cvsserver-server.sh | |
| parent | 4d804c0e64d50e0a9b7b5af7f93b50a5659b1ffc (diff) | |
cvsserver: use whole CVS rev number in-process; don't strip "1." prefix
Keep track of the whole CVS revision number in-process. This will
clarify code when we start handling non-linear revision numbers later.
There is one externally visible change: conflict markers after
an update will now include the full CVS revision number,
including the "1." prefix. It used to leave off the prefix.
Other than the conflict marker, this change doesn't effect
external functionality. No new features, and the DB schema
is unchanged such that it continues to store just
the stripped rev numbers (without prefix).
Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9400-git-cvsserver-server.sh')
| -rwxr-xr-x | t/t9400-git-cvsserver-server.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh index 6c693ffe99..9502f2438a 100755 --- a/t/t9400-git-cvsserver-server.sh +++ b/t/t9400-git-cvsserver-server.sh @@ -400,7 +400,7 @@ cat >expected.C <<EOF Line 0 ======= LINE 0 ->>>>>>> merge.3 +>>>>>>> merge.1.3 EOF for i in 1 2 3 4 5 6 7 8 |