![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Frank Lichtenheld <frank@lichtenheld.de> | |
| Tue, 6 Mar 2007 09:42:24 +0000 (10:42 +0100) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 12 Mar 2007 05:49:08 +0000 (22:49 -0700) | ||
| commit | 538778469ca267c8888bc659d20680c3a1e077fd | |
| tree | e1ee911b54b5e22ec508e58f433317d1d53ae735 | tree | snapshot |
| parent | ed8ad7e2e29d4adf342964f6cc15d6b84f62c700 | commit | diff |
cvsserver: Use Merged response instead of Update-existing for merged files
Using Update-existing leads to the client forgetting about the "locally
modified" status of the file which can lead to loss of local changes on
later updates.
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
Acked-by: Martin Langhoff <martin.langhoff@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Using Update-existing leads to the client forgetting about the "locally
modified" status of the file which can lead to loss of local changes on
later updates.
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
Acked-by: Martin Langhoff <martin.langhoff@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-cvsserver.perl | diff | blob | history |