Re: Again CVS conflicts on www-master

2008-05-04 Thread Jens Seidel
Hi, it happened again. Could someone please *properly* inspect this issue, report a bug against CVS and solve it? On Fri, Apr 11, 2008 at 02:39:28PM -0700, Matt Kraai wrote: > On Fri, Apr 11, 2008 at 10:43:45PM +0200, Jens Seidel wrote: > > On Fri, Apr 11, 2008 at 07:20:24AM -0700, Matt Kraai wro

Re: Again CVS conflicts on www-master

2008-04-11 Thread Matt Kraai
On Fri, Apr 11, 2008 at 10:43:45PM +0200, Jens Seidel wrote: > On Fri, Apr 11, 2008 at 07:20:24AM -0700, Matt Kraai wrote: > > On Fri, Apr 11, 2008 at 10:10:15AM +0200, Jens Seidel wrote: > > > On Thu, Apr 10, 2008 at 03:01:22PM -0700, Matt Kraai wrote: > > I replaced all of the locally-modified fi

Re: Again CVS conflicts on www-master

2008-04-11 Thread Jens Seidel
On Fri, Apr 11, 2008 at 07:20:24AM -0700, Matt Kraai wrote: > On Fri, Apr 11, 2008 at 10:10:15AM +0200, Jens Seidel wrote: > > On Thu, Apr 10, 2008 at 03:01:22PM -0700, Matt Kraai wrote: > I replaced all of the locally-modified files. I think this is not sufficient. I had this problen only once an

Re: Again CVS conflicts on www-master

2008-04-11 Thread Matt Kraai
On Fri, Apr 11, 2008 at 10:10:15AM +0200, Jens Seidel wrote: > On Thu, Apr 10, 2008 at 03:01:22PM -0700, Matt Kraai wrote: > > On Thu, Apr 10, 2008 at 10:31:22PM +0200, Jens Seidel wrote: > > > http://www-master.debian.org/build-logs/webwml/cvs_update.log > > > contains again some CVS conflicts suc

Re: Again CVS conflicts on www-master

2008-04-11 Thread Jens Seidel
On Thu, Apr 10, 2008 at 03:01:22PM -0700, Matt Kraai wrote: > On Thu, Apr 10, 2008 at 10:31:22PM +0200, Jens Seidel wrote: > > http://www-master.debian.org/build-logs/webwml/cvs_update.log > > contains again some CVS conflicts such as > > > > I think I observed in the past a slight change in the e

Re: Again CVS conflicts on www-master

2008-04-10 Thread Matt Kraai
On Thu, Apr 10, 2008 at 10:31:22PM +0200, Jens Seidel wrote: > http://www-master.debian.org/build-logs/webwml/cvs_update.log > contains again some CVS conflicts such as > > cvs update: Updating german/consultants > cvs update: conflict: `german/consultants/lancentrum.wml' is modified > but no long

Again CVS conflicts on www-master

2008-04-10 Thread Jens Seidel
Hi, http://www-master.debian.org/build-logs/webwml/cvs_update.log contains again some CVS conflicts such as cvs update: Updating german/consultants cvs update: conflict: `german/consultants/lancentrum.wml' is modified but no longer in the repository C german/consultants/lancentrum.wml What was t