X-Authentication-Warning: delorie.com: mail set sender to geda-user-bounces using -f X-Recipient: geda-user AT delorie DOT com Date: Mon, 2 Mar 2015 01:09:13 +0100 From: Kai-Martin Knaak To: geda-user AT delorie DOT com Subject: Re: [geda-user] some downtime... Message-ID: <20150302010913.2f3067d0@akka> In-Reply-To: <201503012234.t21MYeW8010226@envy.delorie.com> References: <201502282110 DOT t1SLAUpr002983 AT envy DOT delorie DOT com> <201503011915 DOT t21JFoYS002150 AT envy DOT delorie DOT com> <201503012234 DOT t21MYeW8010226 AT envy DOT delorie DOT com> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/qGFjVZ4VkF8LLRA2l.hploO"; protocol="application/pgp-signature" X-Provags-ID: V03:K0:MzviXaDr5smkqluS1Bl2txU+nlsAt4wmIsQfVdQ/T91lQL+hIwC 7R2xqm4c//2/e3ijG3qQV4NDZiM+3rDRcqZgO5f8G+YfJgnNoBiZ0l8J5egCXASezj9nZFU I8wDUJ8/063MJA6UM/cc6V56vV8V09ZLnU4wAha6JYuu55YhZQbkcH+c9OsFIti/9ZqLzMs fsWejLTVcxrlvc38oSrKQ== X-UI-Out-Filterresults: notjunk:1; Reply-To: geda-user AT delorie DOT com Errors-To: nobody AT delorie DOT com X-Mailing-List: geda-user AT delorie DOT com X-Unsubscribes-To: listserv AT delorie DOT com Precedence: bulk --Sig_/qGFjVZ4VkF8LLRA2l.hploO Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable DJ Delorie schrieb am 1. March 2015: > You need to "cvs update" the changelog, then edit it and look for > conflicts, and fix them. A combination of "cvs update" and "cvs checkout" did the trick. The CVS repo finally seems to be in sync with my local copy, now. :-) ---<)kaimartin(>--- --=20 Kai-Martin Knaak --Sig_/qGFjVZ4VkF8LLRA2l.hploO Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAlTzqi4ACgkQt9RkiGwLn1NmKwCglOQDmAoNiuFsw6fOCndcKMj6 HDwAoKmdqgkxv5VOQfR2jlkJUXSL9vON =dGMW -----END PGP SIGNATURE----- --Sig_/qGFjVZ4VkF8LLRA2l.hploO--