From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: oops Date: Mon, 08 May 2017 22:52:44 -0400 Message-ID: References: <20170508171303.215891.FMU2863@unexploded-cow.prv.splode.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: blaine.gmane.org 1494298420 20375 195.159.176.226 (9 May 2017 02:53:40 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 9 May 2017 02:53:40 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue May 09 04:53:33 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7vHJ-0005Aa-8c for ged-emacs-devel@m.gmane.org; Tue, 09 May 2017 04:53:33 +0200 Original-Received: from localhost ([::1]:34676 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7vHO-0007Aj-GZ for ged-emacs-devel@m.gmane.org; Mon, 08 May 2017 22:53:38 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48242) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7vGm-00079k-VN for emacs-devel@gnu.org; Mon, 08 May 2017 22:53:02 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7vGi-0007mB-8M for emacs-devel@gnu.org; Mon, 08 May 2017 22:53:01 -0400 Original-Received: from [195.159.176.226] (port=56266 helo=blaine.gmane.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d7vGi-0007l5-13 for emacs-devel@gnu.org; Mon, 08 May 2017 22:52:56 -0400 Original-Received: from list by blaine.gmane.org with local (Exim 4.84_2) (envelope-from ) id 1d7vGX-0004MZ-Mh for emacs-devel@gnu.org; Tue, 09 May 2017 04:52:45 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 70 Original-X-Complaints-To: usenet@blaine.gmane.org Cancel-Lock: sha1:pQ3qteVSb/iVBRJ0c5afpRSk0iE= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 195.159.176.226 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:214710 Archived-At: > Ok, actually as far as I can tell no branches were modified, but the server > generated a whole slew of diffs for changes that were already there, and I > don't understand why. Apologies still. Maybe no branch was modified, but many branches were (re)created: + git pull remote: Counting objects: 8417, done. remote: Compressing objects: 100% (380/380), done. remote: Total 1145 (delta 877), reused 1022 (delta 764) Réception d'objets: 100% (1145/1145), 321.10 KiB | 294.00 KiB/s, fait. Résolution des deltas: 100% (877/877), complété avec 170 objets locaux. Depuis git+ssh://git.sv.gnu.org/srv/git/emacs 52f7440b8e..5e2cf8c804 master -> origin/master * [nouvelle branche] cairo -> origin/cairo * [nouvelle branche] concurrency -> origin/concurrency * [nouvelle branche] dynamic-modules -> origin/dynamic-modules * [nouvelle branche] dynamic-modules-rc2 -> origin/dynamic-modules-rc2 784602b105..c0d42853cd emacs-25 -> origin/emacs-25 * [nouvelle branche] emacs-25-merge -> origin/emacs-25-merge * [nouvelle branche] feature/aptel/dynamic-modules-rc3 -> origin/feature/aptel/dynamic-modules-rc3 * [nouvelle branche] feature/documentation-for-auto-undo -> origin/feature/documentation-for-auto-undo 7c3595470d..28f6e8a04b feature/gnus-select -> origin/feature/gnus-select * [nouvelle branche] feature/manual-ldefs-rebased -> origin/feature/manual-ldefs-rebased * [nouvelle branche] feature/standard-test-location -> origin/feature/standard-test-location * [nouvelle branche] feature/tests-depend-on-source -> origin/feature/tests-depend-on-source * [nouvelle branche] fix/no-undo-boundary-on-secondary-buffer-change -> origin/fix/no-undo-boundary-on-secondary-buffer-change * [nouvelle branche] fix/segfault-from-run-undoable-change -> origin/fix/segfault-from-run-undoable-change * [nouvelle branche] fix/segfault-undoable-change-prepare-for-buffer -> origin/fix/segfault-undoable-change-prepare-for-buffer * [nouvelle branche] fix/subst-char-in-region -> origin/fix/subst-char-in-region * [nouvelle branche] fix/undo-point-in-wrong-place -> origin/fix/undo-point-in-wrong-place * [nouvelle branche] fix/viper-undo -> origin/fix/viper-undo * [nouvelle branche] fix/viper-undo-squash -> origin/fix/viper-undo-squash * [nouvelle branche] map -> origin/map * [nouvelle branche] nsm -> origin/nsm * [nouvelle branche] other-branches/glibc-2_0_x -> origin/other-branches/glibc-2_0_x * [nouvelle branche] other-branches/thomas-posix1996 -> origin/other-branches/thomas-posix1996 * [nouvelle branche] scratch/calancha-revert-2c8a7e5 -> origin/scratch/calancha-revert-2c8a7e5 * [nouvelle branche] scratch/check-declare -> origin/scratch/check-declare * [nouvelle branche] scratch/face-realization -> origin/scratch/face-realization * [nouvelle branche] scratch/gnus-cloud -> origin/scratch/gnus-cloud * [nouvelle branche] scratch/install-package-from-directory -> origin/scratch/install-package-from-directory * [nouvelle branche] scratch/isearch-character-group-folding -> origin/scratch/isearch-character-group-folding * [nouvelle branche] scratch/outline -> origin/scratch/outline * [nouvelle branche] scratch/outline-nowhitespace -> origin/scratch/outline-nowhitespace * [nouvelle branche] scratch/package-fix -> origin/scratch/package-fix * [nouvelle branche] scratch/package.el-async-refresh -> origin/scratch/package.el-async-refresh + 45267fc81a...390612eb7a scratch/record -> origin/scratch/record (mise à jour forcée) * [nouvelle branche] seq-let -> origin/seq-let Mise à jour 52f7440b8e..5e2cf8c804 Fast-forward lib/intprops.h | 20 +--------- lib/utimens.c | 18 +++++++-- lisp/net/tramp-adb.el | 2 + lisp/net/tramp-cmds.el | 8 ++-- lisp/net/tramp-compat.el | 5 +-- lisp/net/tramp-gvfs.el | 9 ++--- lisp/net/tramp-sh.el | 6 +-- lisp/net/tramp-smb.el | 6 +-- lisp/net/tramp.el | 28 +++++++++++-- lisp/progmodes/verilog-mode.el | 91 +++++++++++++++++++++++++++++++----------- test/lisp/filenotify-tests.el | 9 +++-- test/lisp/net/tramp-tests.el | 54 ++++++++++++++++++++++++- 12 files changed, 177 insertions(+), 79 deletions(-) where "nouvelle branche" means "new branch". Could you try and fix those? Stefan