* [PATCH] cvsserver: Use Merged response instead of Update-existing for merged files
@ 2007-03-06 9:42 Frank Lichtenheld
2007-03-10 1:37 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Frank Lichtenheld @ 2007-03-06 9:42 UTC (permalink / raw)
To: git; +Cc: Frank Lichtenheld
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>
---
git-cvsserver.perl | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 1bf892e..65fcc84 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -957,12 +957,12 @@ sub req_update
{
$log->info("Merged successfully");
print "M M $filename\n";
- $log->debug("Update-existing $dirpart");
+ $log->debug("Merged $dirpart");
# Don't want to actually _DO_ the update if -n specified
unless ( $state->{globaloptions}{-n} )
{
- print "Update-existing $dirpart\n";
+ print "Merged $dirpart\n";
$log->debug($state->{CVSROOT} . "/$state->{module}/$filename");
print $state->{CVSROOT} . "/$state->{module}/$filename\n";
my $kopts = kopts_from_path($filepart);
@@ -978,7 +978,7 @@ sub req_update
# Don't want to actually _DO_ the update if -n specified
unless ( $state->{globaloptions}{-n} )
{
- print "Update-existing $dirpart\n";
+ print "Merged $dirpart\n";
print $state->{CVSROOT} . "/$state->{module}/$filename\n";
my $kopts = kopts_from_path($filepart);
print "/$filepart/1.$meta->{revision}/+/$kopts/\n";
--
1.5.0.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] cvsserver: Use Merged response instead of Update-existing for merged files
2007-03-06 9:42 [PATCH] cvsserver: Use Merged response instead of Update-existing for merged files Frank Lichtenheld
@ 2007-03-10 1:37 ` Junio C Hamano
2007-03-11 22:21 ` Martin Langhoff
0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2007-03-10 1:37 UTC (permalink / raw)
To: Martin Langhoff; +Cc: git, Andy Parkins, Frank Lichtenheld
Frank Lichtenheld <frank@lichtenheld.de> writes:
> 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.
To me, both of these hunks look correct (the first one is clean
merge, the second one is merge with conflicts). Ack?
> Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de>
> ---
> git-cvsserver.perl | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/git-cvsserver.perl b/git-cvsserver.perl
> index 1bf892e..65fcc84 100755
> --- a/git-cvsserver.perl
> +++ b/git-cvsserver.perl
> @@ -957,12 +957,12 @@ sub req_update
> {
> $log->info("Merged successfully");
> print "M M $filename\n";
> - $log->debug("Update-existing $dirpart");
> + $log->debug("Merged $dirpart");
>
> # Don't want to actually _DO_ the update if -n specified
> unless ( $state->{globaloptions}{-n} )
> {
> - print "Update-existing $dirpart\n";
> + print "Merged $dirpart\n";
> $log->debug($state->{CVSROOT} . "/$state->{module}/$filename");
> print $state->{CVSROOT} . "/$state->{module}/$filename\n";
> my $kopts = kopts_from_path($filepart);
> @@ -978,7 +978,7 @@ sub req_update
> # Don't want to actually _DO_ the update if -n specified
> unless ( $state->{globaloptions}{-n} )
> {
> - print "Update-existing $dirpart\n";
> + print "Merged $dirpart\n";
> print $state->{CVSROOT} . "/$state->{module}/$filename\n";
> my $kopts = kopts_from_path($filepart);
> print "/$filepart/1.$meta->{revision}/+/$kopts/\n";
> --
> 1.5.0.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] cvsserver: Use Merged response instead of Update-existing for merged files
2007-03-10 1:37 ` Junio C Hamano
@ 2007-03-11 22:21 ` Martin Langhoff
0 siblings, 0 replies; 3+ messages in thread
From: Martin Langhoff @ 2007-03-11 22:21 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Martin Langhoff, git, Andy Parkins, Frank Lichtenheld
On 3/10/07, Junio C Hamano <junkio@cox.net> wrote:
> Frank Lichtenheld <frank@lichtenheld.de> writes:
>
> > 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.
>
> To me, both of these hunks look correct (the first one is clean
> merge, the second one is merge with conflicts). Ack?
Ack!
m
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-03-11 22:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-03-06 9:42 [PATCH] cvsserver: Use Merged response instead of Update-existing for merged files Frank Lichtenheld
2007-03-10 1:37 ` Junio C Hamano
2007-03-11 22:21 ` Martin Langhoff
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).