More CVS troubles

More CVS troubles

[Adrian Cox]

I'm trying to merge the latest updates from openprojects.net into my
local tree with cvs update, but every time I get a conflict I get the
following messages, and cvs exits. Where does /home/jtg come from, and
what does this all mean?

RCS file: /cvs/linux/linux/drivers/char/serial.c,v
retrieving revision 1.51
retrieving revision 1.51.2.1
Merging differences between 1.51 and 1.51.2.1 into serial.c
M drivers/char/serial.c
cvs [server aborted]: can't chdir(/home/jtg): No such file or
directory   

The merge happens fine, and when I restart the update it continues to
the next merge. But restarting the update is making the process very
slow, and I would like to find out if 2.2.11 is really a disaster.

- Adrian Cox, AG Electronics

[[ This message was sent via the linuxppc-dev mailing list.  Replies are ]]
[[ not  forced  back  to the list, so be sure to Cc linuxppc-dev if your ]]
[[ reply is of general interest. Please check http://lists.linuxppc.org/ ]]
[[ and http://www.linuxppc.org/ for useful information before posting.   ]]

Re: More CVS troubles

[Geert Uytterhoeven]

On Tue, 10 Aug 1999, Adrian Cox wrote:
> I'm trying to merge the latest updates from openprojects.net into my
> local tree with cvs update, but every time I get a conflict I get the
> following messages, and cvs exits. Where does /home/jtg come from, and
> what does this all mean?
> 
> RCS file: /cvs/linux/linux/drivers/char/serial.c,v
> retrieving revision 1.51
> retrieving revision 1.51.2.1
> Merging differences between 1.51 and 1.51.2.1 into serial.c
> M drivers/char/serial.c
> cvs [server aborted]: can't chdir(/home/jtg): No such file or
> directory   
> 
> The merge happens fine, and when I restart the update it continues to
> the next merge. But restarting the update is making the process very
> slow, and I would like to find out if 2.2.11 is really a disaster.

I saw the same: update works fine, until after the first merge.

Greetings,

						Geert

--
Geert Uytterhoeven                     Geert.Uytterhoeven@cs.kuleuven.ac.be
Wavelets, Linux/{m68k~Amiga,PPC~CHRP}  http://www.cs.kuleuven.ac.be/~geert/
Department of Computer Science -- Katholieke Universiteit Leuven -- Belgium


[[ This message was sent via the linuxppc-dev mailing list.  Replies are ]]
[[ not  forced  back  to the list, so be sure to Cc linuxppc-dev if your ]]
[[ reply is of general interest. Please check http://lists.linuxppc.org/ ]]
[[ and http://www.linuxppc.org/ for useful information before posting.   ]]

Re: More CVS troubles

[Adrian Cox]

Geert Uytterhoeven wrote:
> On Tue, 10 Aug 1999, Adrian Cox wrote:
> > The merge happens fine, and when I restart the update it continues to
> > the next merge. But restarting the update is making the process very
> > slow, and I would like to find out if 2.2.11 is really a disaster.
> I saw the same: update works fine, until after the first merge.

With much patience I got 2.2.11 merged in. It seems well behaved on my
embedded G3 with a Debian userspace, which does not provide much help to
those running LinuxPPC on a Powermac.

- Adrian Cox, AG Electronics

[[ This message was sent via the linuxppc-dev mailing list.  Replies are ]]
[[ not  forced  back  to the list, so be sure to Cc linuxppc-dev if your ]]
[[ reply is of general interest. Please check http://lists.linuxppc.org/ ]]
[[ and http://www.linuxppc.org/ for useful information before posting.   ]]