From: spamassassin-devel-admin@lists.sourceforge.net  Thu Aug 29 11:08:30 2002
Return-Path: <spamassassin-devel-admin@example.sourceforge.net>
Delivered-To: yyyy@localhost.netnoteinc.com
Received: from localhost (localhost [127.0.0.1])
	by phobos.labs.netnoteinc.com (Postfix) with ESMTP id 36B5E4416F
	for <jm@localhost>; Thu, 29 Aug 2002 06:06:15 -0400 (EDT)
Received: from phobos [127.0.0.1]
	by localhost with IMAP (fetchmail-5.9.0)
	for jm@localhost (single-drop); Thu, 29 Aug 2002 11:06:15 +0100 (IST)
Received: from usw-sf-list2.sourceforge.net (usw-sf-fw2.sourceforge.net
    [216.136.171.252]) by dogma.slashnull.org (8.11.6/8.11.6) with ESMTP id
    g7T4qPZ30603 for <jm@jmason.org>; Thu, 29 Aug 2002 05:52:25 +0100
Received: from usw-sf-list1-b.sourceforge.net ([10.3.1.13]
    helo=usw-sf-list1.sourceforge.net) by usw-sf-list2.sourceforge.net with
    esmtp (Exim 3.31-VA-mm2 #1 (Debian)) id 17kHGo-0002mR-00; Wed,
    28 Aug 2002 21:51:02 -0700
Received: from adsl-209-204-188-196.sonic.net ([209.204.188.196]
    helo=sidebone.sidney.com) by usw-sf-list1.sourceforge.net with esmtp
    (Cipher TLSv1:DES-CBC3-SHA:168) (Exim 3.31-VA-mm2 #1 (Debian)) id
    17kHGA-00016k-00 for <SpamAssassin-devel@lists.sourceforge.net>;
    Wed, 28 Aug 2002 21:50:22 -0700
Received: from siddesktop ([63.150.47.99]) by sidebone.sidney.com
    (8.12.5/8.12.5) with SMTP id g7T4nwCp030411; Wed, 28 Aug 2002 21:49:58
    -0700
Message-Id: <005b01c24f17$823b1f30$fa7d940a@siddesktop>
From: "Sidney Markowitz" <sidney@sidney.com>
To: "Theo Van Dinter" <felicity@kluge.net>,
	"Justin Mason" <jm@jmason.org>
Cc: <SpamAssassin-devel@example.sourceforge.net>
References: <20020828230545.GB6877@kluge.net>
    <32978.194.125.173.10.1030577657.squirrel@jmason.org>
    <20020829022418.GG6877@kluge.net>
Subject: Re: [SAdev] 2.40: ready for release?
MIME-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
X-Priority: 3
X-Msmail-Priority: Normal
X-Mailer: Microsoft Outlook Express 6.00.2600.0000
X-Mimeole: Produced By Microsoft MimeOLE V6.00.2600.0000
X-Scanned-BY: MIMEDefang 2.19 (www . roaringpenguin . com / mimedefang)
Sender: spamassassin-devel-admin@example.sourceforge.net
Errors-To: spamassassin-devel-admin@example.sourceforge.net
X-Beenthere: spamassassin-devel@example.sourceforge.net
X-Mailman-Version: 2.0.9-sf.net
Precedence: bulk
List-Help: <mailto:spamassassin-devel-request@example.sourceforge.net?subject=help>
List-Post: <mailto:spamassassin-devel@example.sourceforge.net>
List-Subscribe: <https://example.sourceforge.net/lists/listinfo/spamassassin-devel>,
    <mailto:spamassassin-devel-request@lists.sourceforge.net?subject=subscribe>
List-Id: SpamAssassin Developers <spamassassin-devel.example.sourceforge.net>
List-Unsubscribe: <https://example.sourceforge.net/lists/listinfo/spamassassin-devel>,
    <mailto:spamassassin-devel-request@lists.sourceforge.net?subject=unsubscribe>
List-Archive: <http://www.geocrawler.com/redir-sf.php3?list=spamassassin-devel>
X-Original-Date: Wed, 28 Aug 2002 21:49:49 -0700
Date: Wed, 28 Aug 2002 21:49:49 -0700
X-Pyzor: Reported 0 times.
X-Spam-Status: No, hits=-3.0 required=7.0
	tests=FORGED_RCVD_TRAIL,KNOWN_MAILING_LIST,REFERENCES,
	      SPAM_PHRASE_01_02,USER_AGENT_OE
	version=2.40-cvs
X-Spam-Level: 

> It's this section of spamassassin.raw:
>
> <<<<<<< spamassassin.raw
[...snip]       }
> =3D=3D=3D=3D=3D=3D=3D
[... snip ...]
> >>>>>>> 1.68.2.10
[...snip...]

This is what cvs puts in when you modify the copy of the file on your disk
and someone checks in a change and then you pull an update and cvs can't
figure out how to merge your changes and the checked in changes. The lines
between the <<<<<< and the ===== are in your file and the ones in the next
section are what have been checked in. You must have not noticed the warning
messages about conflicts that cvs gave you when you did the update, and the
"C" flag next to that file when cvs listed the files being pulled.

 -- sidney




-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Spamassassin-devel mailing list
Spamassassin-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spamassassin-devel

