RE: Mergemaster killed symlink (was RE: Mergemaster bug + new feature [patch])

2001-06-19 Thread Koster, K.J.
Dear James, > > > I had a mergemaster problem a while back, but I haven't debugged it > > properly. I had my /etc/ppp symlinked into /home/root/ppp. > Then, after a > > mergemaster run I ended up with a file named /etc/ppp, which had the > > contents of the new version of /etc/ppp/ppp.conf. > >

Mergemaster killed symlink (was RE: Mergemaster bug + new feature [patch])

2001-06-18 Thread James Halstead
On Monday 18 June 2001 17:04, Koster, K.J. wrote: > I had a mergemaster problem a while back, but I haven't debugged it > properly. I had my /etc/ppp symlinked into /home/root/ppp. Then, after a > mergemaster run I ended up with a file named /etc/ppp, which had the > contents of the new version of

RE: Mergemaster bug + new feature [patch]

2001-06-18 Thread Koster, K.J.
Dear James, I had a mergemaster problem a while back, but I haven't debugged it properly. I had my /etc/ppp symlinked into /home/root/ppp. Then, after a mergemaster run I ended up with a file named /etc/ppp, which had the contents of the new version of /etc/ppp/ppp.conf. This box used to dial ou

Mergemaster bug + new feature [patch]

2001-06-15 Thread James
It seems I have found a couple bugs, I noticed that mergemaster was always saying that the "install failed, the file has to be merged manually" even thought the install was successful. It would seem that the recent commit is using "install && test && rm" but the install program will already hav