[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnash-dev] Rubbish in cvs updates
From: |
strk |
Subject: |
Re: [Gnash-dev] Rubbish in cvs updates |
Date: |
Tue, 30 Jan 2007 09:28:27 +0100 |
On Mon, Jan 29, 2007 at 11:31:54PM +0000, Martin Guy wrote:
> Hi
> I keep getting RCS internal rubbish dumped in files when I cvs
> update. Latest example: gui/Makefile.am:182
>
> AM_LDFLAGS += $(XFT_LIBS)
> =======
> AM_LDFLAGS += $(FLTK2_LIBS) $(XFT_LIBS) $(X11_LIBS)
> >>>>>>>1.59
> else
> FLTK_SRCS =
>
> Debian etch. Has anyone else has this problem or is it just me?
It's a conflict. You modified the same section which was already modified
in the repository. When this happens, at 'cvs update' time, you'd get
a 'C' near the conflicting file, which is modified with that syntax.
The two conflicting changes are enclosed between <<<<<, ==== and >>>>.
Example>
Common things
<<<<<1.59
Repository canges
=====
My own changes
>>>>>1.59
Common things
(I'm not sure abot the revision numbers)
To resolve the conflict you pick the version you think is correct
and wipe out the rest. Example:
Common things
Repository canges
Common things
Or:
Common things
My own changes
Common things
--strk;