projects
/
spider.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
27a5024
)
fix merge command
author
minima
<minima>
Fri, 29 Jun 2001 21:51:06 +0000
(21:51 +0000)
committer
minima
<minima>
Fri, 29 Jun 2001 21:51:06 +0000
(21:51 +0000)
Changes
patch
|
blob
|
history
cmd/merge.pl
patch
|
blob
|
history
diff --git
a/Changes
b/Changes
index 734bbdfc867b90c25f316d166395e9873686a27e..254ec1ffbb15d90e698b29eb17245d9e55a3d3cd 100644
(file)
--- a/
Changes
+++ b/
Changes
@@
-1,3
+1,5
@@
+29Jun01=======================================================================
+1. fix merge command
28Jun01=======================================================================
1. fix problems with users on more than one node
27Jun01=======================================================================
28Jun01=======================================================================
1. fix problems with users on more than one node
27Jun01=======================================================================
diff --git
a/cmd/merge.pl
b/cmd/merge.pl
index 87a9827ebcedd4485a0ed75e1fe908bb4bea879c..26cef42a6265828b32d0a7666e1c8c402eec3ce9 100644
(file)
--- a/
cmd/merge.pl
+++ b/
cmd/merge.pl
@@
-16,7
+16,7
@@
return (1, $self->msg('e12')) if !$f[0];
my $call = uc $f[0];
return (1, $self->msg('e11')) if $call eq $main::mycall;
my $call = uc $f[0];
return (1, $self->msg('e11')) if $call eq $main::mycall;
-my $ref = Route::Node:get($call);
+my $ref = Route::Node:
:
get($call);
my $dxchan = $ref->dxchan if $ref;
return (1, $self->msg('e10', $call)) unless $ref;
my $dxchan = $ref->dxchan if $ref;
return (1, $self->msg('e10', $call)) unless $ref;