From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.devel Subject: Problems merging NEWS for the nth time Date: Sun, 22 May 2022 09:53:45 +0200 Message-ID: Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="10225"; mail-complaints-to="usenet@ciao.gmane.io" To: Emacs developers Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun May 22 09:55:39 2022 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nsgR9-0002Yt-83 for ged-emacs-devel@m.gmane-mx.org; Sun, 22 May 2022 09:55:39 +0200 Original-Received: from localhost ([::1]:58496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nsgR7-0006xN-O7 for ged-emacs-devel@m.gmane-mx.org; Sun, 22 May 2022 03:55:37 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:57350) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nsgPY-0006Ff-06 for emacs-devel@gnu.org; Sun, 22 May 2022 03:54:00 -0400 Original-Received: from mail-pl1-f179.google.com ([209.85.214.179]:37509) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nsgPW-0005uW-HE for emacs-devel@gnu.org; Sun, 22 May 2022 03:53:59 -0400 Original-Received: by mail-pl1-f179.google.com with SMTP id m12so10615786plb.4 for ; Sun, 22 May 2022 00:53:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=9uewYPBF7ntVLELZR53Y2PQW5DlWkkpb2T9BVupcB/8=; b=wvuFRcYOeVQ3EtEfwN0qpTMn609aVkINUnDKRbH3KQfRGFZv986mqOVvepj4hMOfG2 Mq0ufOhs1OsAK6Ke/DzXdP4c3k+hf+NvTQXIPjUphxf3+OWQ81R1jZxQlfu1HjZTctUp nABlPrXwD9F+sjVRNoiXfZppCklzDWV+RKeEKZeqhK2X3MEpurBwdIe3RxIQnwtiqJ9/ 1H4KX63jf1E4/0nF6p7FsS9rCLxr1sfcwsbCbVZ9M1x7yDATVDKRdiGXetxYMxScHSrF 4nHd0vT5bfL9wSrxNoCDoH2hOIQiExROt2vy5TMOtvIrfZmzs/XXTq09tEZygVFMMrbU mYgA== X-Gm-Message-State: AOAM532VzapfXrJkmwt9tRnEwAN5YT8dnYybX47mWHSCjjYeS1d7GZbB Cn8ZR/DmXPVpVSVvNauOInJQLuEynMYM5mEvVbBCV6vfLks= X-Google-Smtp-Source: ABdhPJwNn+bTVFMq5rHE32FqAW0XsgTWYHzatHFNdUHBro+WqSeh0GT+YnsF5P8uSmT9hsCGqmAm9p8Y1EScHmqdRRw= X-Received: by 2002:a17:902:7783:b0:15f:21f8:a1d6 with SMTP id o3-20020a170902778300b0015f21f8a1d6mr17594726pll.66.1653206036309; Sun, 22 May 2022 00:53:56 -0700 (PDT) Received-SPF: pass client-ip=209.85.214.179; envelope-from=stefankangas@gmail.com; helo=mail-pl1-f179.google.com X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:290077 Archived-At: There are problems with merging NEWS again, and manual intervention is needed. $ ./admin/automerge -b -t -p -n1 -r Resetting... Pulling... Merging... Finding missing commits... Finding missing commits...done Merging af1c05..b05d1e There are unresolved conflicts in lisp/abbrev.el There are unresolved conflicts in etc/NEWS Failed to fix NEWS conflict Conflicts in: etc/NEWS lisp/abbrev.el Resolve the conflicts manually automerge: merge error