unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Steinar Bang <sb@dod.no>
To: emacs-devel@gnu.org
Subject: Re: VC mode and git
Date: Sun, 05 Apr 2015 00:05:27 +0200	[thread overview]
Message-ID: <867ftr8s7s.fsf@dod.no> (raw)
In-Reply-To: 55200A71.9040902@gmx.at

>>>>> martin rudalics <rudalics@gmx.at>:

> error: Your local changes to the following files would be overwritten by merge:
> ...
> Please, commit your changes or stash them before you can merge.
> Aborting


> AFAICT this signlas a succeeding fetch and a failing merge.

Not exactly, it signals a succeding fetch, and no merge done

> IIUC git's pull is not atomic.  When the merge fails with a message like
> the above I have no idea in what state my copy of a repository is in.

It is in the same state it was as before you did the pull.

> Well, I wouldn't know even without that message ...
[snip!]
> In the one case I get the message cited above.  In the other case I get
> conflicts and git asks me to resolve them.

Now, _if_ you have modified uncommitted changes, _and_ get conflicts,
then things get slightly worse.

The conflicts will not be in any of your locally modified files, because
those haven't been touched by the merge (if they were, the merge
wouldn't have started).

> Now suppose that, in reaction to the message above I do

> git commit -a
> git pull

> and now am told to resolve my conflicts.  I do that via smerge-mode,
> save the file(s) which had the conflict(s) and do

> git commit

> as recommended.  I tried that just now with a conflict in Changelog.
> After this git told me that

> On branch master
> Your branch and 'origin/master' have diverged,
> and have 2 and 74 different commits each, respectively.
>   (use "git pull" to merge the remote branch into yours)

> All conflicts fixed but you are still merging.
>   (use "git commit" to conclude merge)

This message means your merge wasn't completed.  What did
 git commit
say?  Were there more files than the ChangeLog that needed merging?

Didn't smerge-mode automatically stage the conflict-fixed file for
commit?  (didn't you remove all conflict markers?)

> and, after the recommended git pull

> CONFLICT (content): Merge conflict in lisp/ChangeLog
> Automatic merge failed; fix conflicts and then commit the result.

> just that I did not find any conflicts at this stage.

You mean no conflict markers in the ChangeLog?  Did you try diffing
ChangeLog against orgin/master to see if there were changes and if they
looked sensible?

Did you try staging ChangeLog manually for commit?
 git add ChangeLog

> So I practically ended up in an infinite loop which I was able to
> break only via a hard reset.  I suppose this is similar if not identic
> to Richard's original problem which is apparently very easily
> reproducible here.

A hard reset sounded a bit drastic.

Did you have changes in the ChangeLog that were yours? Or was the
conflict purely caused by git?

> Stashing is offered in the first git message cited above.  If it's bad
> we should tell people why.  OTOH I never had a problem with stashing
> and in particular it never got me into the loop I mentioned later.

The reason to stay away from stash from this workflow, is that it is yet
another concept to relate to.

The fact that "git stash pop" can result in a conflict that needs to be
resolved and seemingly needs to be committed (it doesn't), is a
complicating factor for a simple CVS-like workflow.




  parent reply	other threads:[~2015-04-04 22:05 UTC|newest]

Thread overview: 541+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-24 15:57 VC mode and git Richard Stallman
2015-03-24 16:05 ` Dmitry Gutov
2015-03-26 10:54   ` Richard Stallman
2015-03-26 11:54     ` Dmitry Gutov
2015-03-26 11:57     ` John Yates
2015-03-26 17:00       ` Eli Zaretskii
2015-03-27  3:09       ` Richard Stallman
2015-03-24 16:10 ` Rasmus
2015-03-24 16:19 ` Jan D.
2015-03-24 16:20 ` Daniel Colascione
2015-03-26 10:54   ` Richard Stallman
2015-03-24 16:37 ` Eric S. Raymond
2015-03-24 17:20   ` Eli Zaretskii
2015-03-24 17:24     ` Daniel Colascione
2015-03-24 17:26       ` Eli Zaretskii
2015-03-24 17:36         ` Daniel Colascione
2015-03-25 14:43       ` Richard Stallman
2015-03-24 17:35     ` Eric S. Raymond
2015-03-24 18:03       ` Eli Zaretskii
2015-03-24 18:19         ` Eric S. Raymond
2015-03-25 14:43           ` Richard Stallman
2015-03-25 16:47             ` Eric S. Raymond
2015-03-26 10:56               ` Richard Stallman
2015-03-26 11:23                 ` Eric S. Raymond
2015-03-27  3:09                   ` Richard Stallman
2015-03-27  6:38                     ` Stephen J. Turnbull
2015-03-27 12:30                       ` Alan Mackenzie
2015-03-27 13:22                         ` Eli Zaretskii
2015-03-28 16:15                         ` Richard Stallman
2015-03-27 13:02                       ` Stefan Monnier
2015-03-27 16:53                         ` Stephen J. Turnbull
2015-03-27 18:10                           ` Stefan Monnier
2015-03-27 19:12                             ` Eli Zaretskii
2015-03-27 18:57                           ` Eli Zaretskii
2015-03-27  7:50                     ` Andreas Schwab
2015-03-26 11:57                 ` Dmitry Gutov
2015-03-25 17:57             ` Eli Zaretskii
2015-03-26 10:57               ` Richard Stallman
2015-03-26 16:47                 ` Eli Zaretskii
2015-03-26 10:57               ` Richard Stallman
2015-03-26 16:50                 ` Eli Zaretskii
2015-03-25 18:46             ` Paul Eggert
2015-03-24 18:04     ` Andreas Schwab
2015-03-25 14:43       ` Richard Stallman
2015-03-25 15:32         ` Andreas Schwab
2015-03-25 16:31           ` Eric S. Raymond
2015-03-26 10:56             ` Richard Stallman
2015-03-26 10:56           ` Richard Stallman
2015-03-26 11:03             ` Andreas Schwab
2015-03-26 11:38               ` Tassilo Horn
2015-03-26 16:59                 ` Eli Zaretskii
2015-03-26 17:07                   ` Dmitry Gutov
2015-03-26 17:15                     ` Eli Zaretskii
2015-03-27 13:25                     ` Richard Stallman
2015-03-27 13:34                       ` Eli Zaretskii
2015-03-28 16:16                         ` Richard Stallman
2015-03-28 17:41                           ` Eli Zaretskii
2015-03-28 19:54                             ` Stefan Monnier
2015-03-27  3:09                 ` Richard Stallman
2015-03-27  7:35                   ` Eli Zaretskii
2015-03-27 12:59                     ` Stefan Monnier
2015-03-27 13:30                       ` Eli Zaretskii
2015-03-27 17:58                         ` Stefan Monnier
2015-03-27 19:10                           ` Eli Zaretskii
2015-03-27 13:39                       ` Tak Kunihiro
2015-03-27 18:01                         ` Stefan Monnier
2015-03-28 16:16                       ` Richard Stallman
2015-03-26 15:38             ` Yann Hodique
2015-03-25 15:33         ` Yuri Khan
2015-03-25 17:48         ` Eli Zaretskii
2015-03-25  8:48     ` Steinar Bang
2015-03-25 17:30       ` Eli Zaretskii
2015-03-25 21:01         ` Steinar Bang
2015-03-26  3:34           ` Eli Zaretskii
2015-03-26  6:30             ` Steinar Bang
2015-03-26 10:57           ` Richard Stallman
2015-03-26 10:54   ` Richard Stallman
2015-03-26 11:25     ` Eric S. Raymond
2015-03-27  3:09       ` Richard Stallman
2015-03-27  3:21         ` Eric S. Raymond
2015-03-28 16:15           ` Richard Stallman
2015-03-24 17:06 ` Paul Eggert
2015-03-25 14:43   ` Richard Stallman
2015-03-25 18:00     ` Eli Zaretskii
2015-03-26 10:57       ` Richard Stallman
2015-03-26 16:51         ` Eli Zaretskii
2015-03-25 18:04     ` Harald Hanche-Olsen
2015-03-26 10:57       ` Richard Stallman
2015-03-26 11:21         ` Harald Hanche-Olsen
2015-03-27  3:08           ` Richard Stallman
2015-03-26 10:57       ` Richard Stallman
2015-03-26 11:24         ` Harald Hanche-Olsen
2015-03-26 12:16         ` Harald Hanche-Olsen
2015-04-05  9:11           ` Richard Stallman
2015-04-05  9:39             ` Harald Hanche-Olsen
2015-04-05 12:27               ` Steinar Bang
2015-04-05 17:42               ` Richard Stallman
2015-04-05 18:58                 ` Andreas Schwab
2015-04-05 19:48                   ` Alan Mackenzie
2015-04-06  5:50                   ` Richard Stallman
2015-04-06  6:22                     ` Andreas Schwab
2015-04-07 16:13                       ` Richard Stallman
2015-04-07 16:55                         ` Andreas Schwab
2015-04-08 18:21                           ` Richard Stallman
2015-04-05 20:01                 ` Harald Hanche-Olsen
2015-04-05 20:18                   ` Harald Hanche-Olsen
2015-04-06  5:50                     ` Richard Stallman
2015-04-06  6:54                       ` Steinar Bang
2015-04-05 12:43             ` Harald Hanche-Olsen
2015-04-05 13:01               ` Eli Zaretskii
2015-04-05 13:11                 ` Harald Hanche-Olsen
2015-04-05 13:32                   ` Harald Hanche-Olsen
2015-04-05 15:35                     ` Eli Zaretskii
2015-04-05 17:26                       ` Harald Hanche-Olsen
2015-04-05 17:36                         ` Eli Zaretskii
2015-04-05 19:08                 ` Stephen J. Turnbull
2015-04-05 19:16                   ` Eli Zaretskii
2015-04-06 15:58                     ` Harald Hanche-Olsen
2015-04-06 18:46                       ` Steinar Bang
2015-04-05 14:15               ` Yuri Khan
2015-04-05 17:42               ` Richard Stallman
2015-04-05 18:20                 ` Steinar Bang
2015-04-05 18:22                 ` Paul Eggert
2015-04-05 18:36                   ` Eli Zaretskii
2015-04-05 18:46                     ` Paul Eggert
2015-04-05 19:02                       ` Eli Zaretskii
2015-04-06  5:50                         ` Richard Stallman
2015-04-06  7:36                           ` Eli Zaretskii
2015-04-06 13:53                     ` Harald Hanche-Olsen
2015-04-06 14:25                       ` Steinar Bang
2015-04-06 14:53                         ` Harald Hanche-Olsen
2015-04-05 12:55             ` Eli Zaretskii
2015-03-25 18:20     ` Paul Eggert
2015-03-24 17:06 ` Andreas Schwab
2015-03-24 19:05   ` Sebastien Vauban
2015-03-24 19:15     ` Eli Zaretskii
2015-03-24 19:29       ` Daniel Colascione
2015-03-24 19:51         ` Eli Zaretskii
2015-03-24 19:54           ` Daniel Colascione
2015-03-26  9:50             ` Nicolas Richard
2015-03-25  0:41           ` Stephen J. Turnbull
2015-03-25  3:45             ` Eli Zaretskii
2015-03-25  7:21               ` Thien-Thi Nguyen
2015-03-25 17:27                 ` Eli Zaretskii
2015-03-25 22:31                   ` Thien-Thi Nguyen
2015-03-26 16:27                     ` Eli Zaretskii
2015-03-25 14:42         ` Richard Stallman
2015-03-25 17:43           ` Eli Zaretskii
2015-03-26 10:57             ` Richard Stallman
2015-03-26 11:52               ` Michael Albinus
2015-03-26 11:59               ` Eric S. Raymond
2015-03-26 12:23                 ` John Yates
2015-03-26 12:27                 ` Alexis
2015-03-26 17:02                 ` Eli Zaretskii
2015-03-26 16:46               ` Eli Zaretskii
2015-03-27 13:26                 ` Richard Stallman
2015-03-27 13:36                   ` Eli Zaretskii
2015-03-27 18:35                   ` Stephen J. Turnbull
2015-03-27 19:15                     ` Eli Zaretskii
2015-03-28 21:55                       ` Stephen J. Turnbull
2015-03-29  2:41                         ` Eli Zaretskii
2015-03-28 16:17                     ` Richard Stallman
2015-03-28 17:44                       ` Eli Zaretskii
2015-03-29 14:33                         ` Richard Stallman
2015-03-28 16:17                     ` Richard Stallman
2015-03-28 20:29                     ` Barry Warsaw
2015-03-24 19:56       ` Eric S. Raymond
2015-03-24 20:18         ` Eli Zaretskii
2015-03-24 21:54           ` Eric S. Raymond
2015-03-24 20:52       ` chad
2015-03-25  3:34         ` Eli Zaretskii
2015-03-25  6:07           ` Jan D.
2015-03-25 17:24             ` Eli Zaretskii
2015-03-25 18:03               ` Jan D.
2015-03-25 18:11                 ` Eli Zaretskii
2015-03-25 19:33                 ` Eric S. Raymond
2015-03-25 18:21               ` Stefan Monnier
2015-03-25 18:26                 ` Eli Zaretskii
2015-03-25  8:59           ` Steinar Bang
2015-03-24 21:18       ` Dmitry Gutov
2015-03-25  3:36         ` Eli Zaretskii
2015-03-25 15:33           ` Dmitry Gutov
2015-03-25 18:04             ` Eli Zaretskii
2015-03-26 10:56             ` Richard Stallman
2015-03-25  8:52       ` Steinar Bang
2015-03-25  9:00         ` Sebastien Vauban
2015-03-25  9:16           ` Steinar Bang
2015-03-25  9:48             ` Steinar Bang
2015-03-25 12:38               ` Stefan Monnier
2015-03-25 13:56                 ` Steinar Bang
2015-03-25 15:04                   ` Stefan Monnier
2015-03-25 18:03                     ` Eli Zaretskii
2015-03-25 18:19                       ` Alan Mackenzie
2015-03-25 18:37                         ` Yuri Khan
2015-03-25 18:49                           ` Eli Zaretskii
2015-03-25 19:03                             ` Yuri Khan
2015-03-25 19:11                               ` Eli Zaretskii
2015-03-25 19:23                           ` Alan Mackenzie
2015-03-25 19:30                             ` Yuri Khan
2015-03-25 20:46                             ` Steinar Bang
2015-03-25 21:16                           ` Stefan Monnier
2015-03-26  0:00                           ` David Caldwell
2015-03-25 18:49                         ` Lars Brinkhoff
2015-03-25 19:18                           ` Alan Mackenzie
2015-03-25 21:15                         ` Sergey Organov
2015-03-26  3:39                           ` Eli Zaretskii
2015-03-26  7:47                             ` Steinar Bang
2015-03-25 17:32         ` Eli Zaretskii
2015-04-18  1:38       ` vc-dwim when nothing to commit (was: VC mode and git) Ted Zlatanov
2015-04-18  7:39         ` Eli Zaretskii
2015-04-18 10:22           ` vc-dwim when nothing to commit Ted Zlatanov
2015-04-18 11:03             ` Eli Zaretskii
2015-05-04 20:18               ` Ted Zlatanov
2015-05-05 15:44                 ` Eli Zaretskii
2015-04-18 16:11           ` Dmitry Gutov
2015-04-18 16:23             ` Eric S. Raymond
2015-04-18 16:34               ` Eli Zaretskii
2015-04-18 16:30             ` Eli Zaretskii
2015-04-18 19:22               ` Dmitry Gutov
2015-04-18 19:35                 ` Eli Zaretskii
2015-04-18 20:52                   ` Dmitry Gutov
2015-04-18 17:13             ` Lars Magne Ingebrigtsen
2015-04-18 21:33               ` Dmitry Gutov
2015-04-19 10:16                 ` Michael Albinus
2015-03-25  8:53     ` VC mode and git Steinar Bang
2015-03-25  9:05       ` Sebastien Vauban
2015-03-25  9:18         ` Steinar Bang
2015-03-25  9:41           ` Sebastien Vauban
2015-03-25  9:57             ` Steinar Bang
2015-03-25 10:28             ` Eric S. Raymond
2015-03-25 12:40             ` Stefan Monnier
2015-03-26 10:04               ` Nicolas Richard
2015-03-26 10:55             ` Richard Stallman
2015-03-26 12:31               ` Steinar Bang
2015-03-27  3:10                 ` Richard Stallman
2015-03-25 14:42     ` Richard Stallman
2015-03-25 17:46       ` Eli Zaretskii
2015-03-25 23:50       ` Tak Kunihiro
2015-03-26  8:22       ` Andreas Schwab
2015-03-27  3:08         ` Richard Stallman
2015-03-27  7:48           ` Andreas Schwab
2015-03-27  9:06             ` Eli Zaretskii
2015-03-27 12:54               ` Stefan Monnier
2015-03-27 13:26                 ` Eli Zaretskii
2015-03-27 17:53                   ` Stefan Monnier
2015-03-27 18:42                     ` Filipp Gunbin
2015-03-27 19:16                       ` Eli Zaretskii
2015-03-27 19:45                         ` Paul Eggert
2015-03-27 19:57                           ` Eli Zaretskii
2015-03-28 21:59                             ` Stephen J. Turnbull
2015-03-29  6:19                               ` Tak Kunihiro
2015-03-28 10:00                           ` martin rudalics
2015-03-28 23:43                             ` Paul Eggert
2015-03-27 19:03                     ` Eli Zaretskii
2015-03-27 19:19                       ` Allen S. Rout
2015-03-27 19:38                         ` Eli Zaretskii
2015-03-27 20:20                           ` Óscar Fuentes
2015-03-27 22:34                             ` Stefan Monnier
2015-03-28  7:17                               ` Eli Zaretskii
2015-03-28  7:27                                 ` Andreas Schwab
2015-03-28  7:42                                   ` Eli Zaretskii
2015-03-28 12:22                                     ` Stefan Monnier
2015-03-29 14:32                                       ` Richard Stallman
2015-03-28  8:18                                 ` Jan D.
2015-03-28  8:34                                   ` Eli Zaretskii
2015-03-28  9:04                                     ` Eli Zaretskii
2015-03-28 12:22                                       ` Stefan Monnier
2015-03-28  9:05                                 ` Ivan Shmakov
2015-03-28 13:50                                 ` Simon Leinen
2015-03-29  8:24                                   ` Steinar Bang
2015-03-27 20:31                           ` Allen S. Rout
2015-03-28  6:43                             ` Thien-Thi Nguyen
2015-03-28 16:17                     ` Richard Stallman
2015-03-28 16:15                 ` Richard Stallman
2015-03-28 19:52                   ` Stefan Monnier
2015-03-29 14:33                     ` Richard Stallman
2015-03-30  7:24                     ` Mike Gerwitz
2015-03-30  7:54                   ` Mike Gerwitz
2015-03-30 14:40                     ` Eli Zaretskii
2015-03-30 17:24                       ` Stefan Monnier
2015-03-30 17:43                         ` Eli Zaretskii
2015-03-30 20:37                           ` Stefan Monnier
2015-03-31 11:40                             ` Eli Zaretskii
2015-03-30 19:24                       ` Stephen J. Turnbull
2015-03-30 19:44                         ` Eli Zaretskii
2015-03-31  4:03                           ` Stephen J. Turnbull
2015-03-31  6:30                             ` Harald Hanche-Olsen
2015-03-31  7:20                               ` Harald Hanche-Olsen
2015-03-31  8:37                                 ` Andreas Schwab
2015-03-31 12:52                                 ` Harald Hanche-Olsen
2015-04-01 10:21                                   ` Richard Stallman
2015-03-31 14:06                                 ` Richard Stallman
2015-03-31  7:35                               ` Andreas Schwab
2015-03-31  8:25                                 ` Harald Hanche-Olsen
2015-03-31  8:36                                   ` Andreas Schwab
2015-03-31 14:07                                   ` Richard Stallman
2015-03-31 14:15                                     ` Andreas Schwab
2015-03-31 15:34                                       ` Harald Hanche-Olsen
2015-03-31 15:50                                         ` Eli Zaretskii
2015-03-31 16:36                                           ` Harald Hanche-Olsen
2015-03-31 16:58                                             ` Eli Zaretskii
2015-03-31 17:05                                               ` Harald Hanche-Olsen
2015-04-01 10:22                                               ` Richard Stallman
2015-03-31 17:17                                         ` Stephen J. Turnbull
2015-03-31 14:30                                     ` Eli Zaretskii
2015-03-31 15:07                                     ` Steinar Bang
2015-04-01 10:22                                       ` Richard Stallman
2015-04-01 10:35                                         ` Andreas Schwab
2015-04-02  7:19                                           ` Richard Stallman
2015-04-03  7:27                                             ` Steinar Bang
2015-04-03  7:46                                               ` Eli Zaretskii
2015-04-03  8:16                                                 ` Stephen J. Turnbull
2015-04-03  8:30                                                   ` Eli Zaretskii
2015-04-03  8:34                                                 ` Harald Hanche-Olsen
2015-04-03 11:32                                                   ` Eli Zaretskii
2015-04-03  9:22                                                 ` Steinar Bang
2015-04-03 11:33                                                   ` Eli Zaretskii
2015-04-01 14:43                                         ` Eli Zaretskii
2015-04-01 15:25                                           ` Robert Pluim
2015-04-01 15:58                                             ` Eli Zaretskii
2015-04-02  7:01                                               ` Robert Pluim
2015-04-02 15:01                                                 ` Eli Zaretskii
2015-04-02 15:38                                                   ` Robert Pluim
2015-04-03 11:02                                                   ` Richard Stallman
2015-04-03 11:41                                                     ` Eli Zaretskii
2015-04-04 14:48                                                       ` Richard Stallman
2015-04-04 15:14                                                         ` Eli Zaretskii
2015-04-03 15:10                                                     ` Steinar Bang
2015-04-04 14:46                                                       ` Richard Stallman
2015-04-04 15:12                                                         ` Eli Zaretskii
2015-04-04 15:23                                                           ` Steinar Bang
2015-04-04 15:28                                                             ` Eli Zaretskii
2015-04-04 16:09                                                               ` Steinar Bang
2015-04-04 16:36                                                                 ` martin rudalics
2015-04-04 22:09                                                                   ` Steinar Bang
2015-04-04 16:40                                                                 ` Eli Zaretskii
2015-04-05  9:10                                                                 ` Richard Stallman
2015-04-05 17:43                                                           ` Richard Stallman
2015-04-05 17:58                                                             ` Eli Zaretskii
2015-04-01 15:43                                         ` Steinar Bang
2015-04-01 16:00                                           ` Eli Zaretskii
2015-03-31 17:11                                     ` Stephen J. Turnbull
2015-03-31 17:21                                       ` Eli Zaretskii
2015-03-31  8:50                                 ` Alan Mackenzie
2015-03-31  9:02                                   ` Andreas Schwab
2015-03-31  9:24                                   ` Stephen J. Turnbull
2015-03-31 10:49                                     ` Alan Mackenzie
2015-03-31 11:02                                       ` Andreas Schwab
2015-03-31 12:33                                         ` Eli Zaretskii
2015-03-31 11:02                                       ` Andreas Schwab
2015-03-31 12:42                                       ` Steinar Bang
2015-03-31 15:48                                         ` Alan Mackenzie
2015-03-31 17:38                                           ` Stephen J. Turnbull
2015-03-31 20:46                                             ` Alan Mackenzie
2015-03-31 21:43                                               ` Stephen J. Turnbull
2015-04-01  6:18                                                 ` Harald Hanche-Olsen
2015-04-01  7:14                                                   ` Stephen J. Turnbull
2015-04-01 14:21                                                     ` Eli Zaretskii
2015-04-02  7:18                                                     ` Richard Stallman
2015-04-02 17:54                                                       ` Stephen J. Turnbull
2015-04-03 18:25                                                         ` Richard Stallman
2015-04-03 20:43                                                           ` Stephen J. Turnbull
2015-04-03 18:25                                                         ` Richard Stallman
2015-04-01 14:20                                                   ` Eli Zaretskii
2015-04-02  7:18                                                   ` Richard Stallman
2015-04-02  7:22                                                     ` Harald Hanche-Olsen
2015-04-02 18:29                                                       ` Stephen J. Turnbull
2015-04-03 11:03                                                       ` Richard Stallman
2015-03-31 18:31                                           ` Steinar Bang
2015-03-31 18:40                                             ` Steinar Bang
2015-03-31 13:34                                       ` Sebastien Vauban
2015-03-31 14:07                                         ` Eli Zaretskii
2015-03-31 14:26                                           ` Dmitry Gutov
2015-03-31 14:31                                             ` Eli Zaretskii
2015-03-31 14:39                                               ` Andreas Schwab
2015-03-31 14:47                                                 ` Eli Zaretskii
2015-03-31 14:52                                                   ` Andreas Schwab
2015-03-31 15:02                                                     ` Eli Zaretskii
2015-04-01 10:22                                               ` Richard Stallman
2015-04-01 14:44                                                 ` Eli Zaretskii
2015-03-31 14:35                                         ` Stephen J. Turnbull
2015-03-31 14:47                                         ` Steinar Bang
2015-03-31 14:02                                       ` Stephen J. Turnbull
2015-03-31 21:43                                         ` Alan Mackenzie
2015-04-01  1:25                                           ` Stephen J. Turnbull
2015-04-01 12:32                                             ` Alan Mackenzie
2015-04-01 12:54                                               ` Michael Albinus
2015-04-01 19:50                                               ` Ricardo Wurmus
2015-04-01 22:34                                                 ` Alan Mackenzie
2015-04-01 22:37                                                   ` Daniel Colascione
2015-04-02  2:46                                                   ` Eli Zaretskii
2015-04-01 21:11                                               ` Stephen J. Turnbull
2015-04-01 22:05                                                 ` Alan Mackenzie
2015-04-01 23:29                                                   ` chad
2015-04-02 20:09                                                 ` Thien-Thi Nguyen
2015-04-02 22:04                                                   ` Stephen J. Turnbull
2015-04-02 14:52                                               ` Eli Zaretskii
2015-04-02 21:32                                                 ` Daniel Colascione
2015-04-03  7:05                                                   ` Steinar Bang
2015-04-03  7:06                                                   ` Eli Zaretskii
2015-04-01  9:28                                           ` Sergey Organov
2015-04-01 10:32                                             ` Alan Mackenzie
2015-04-01 10:39                                               ` Andreas Schwab
2015-04-01 14:47                                                 ` Eli Zaretskii
2015-04-01 14:51                                                   ` Andreas Schwab
2015-04-01 15:15                                                     ` Eli Zaretskii
2015-04-01 15:39                                                       ` Andreas Schwab
2015-04-01 15:59                                                         ` Eli Zaretskii
2015-04-01 16:09                                                           ` Óscar Fuentes
2015-04-01 16:15                                                             ` Eli Zaretskii
2015-04-01 16:25                                                               ` Drew Adams
2015-04-01 17:09                                                                 ` Óscar Fuentes
2015-04-01 17:47                                                                   ` Eli Zaretskii
2015-04-01 17:52                                                                   ` Drew Adams
2015-04-01 17:29                                                                 ` Jose E. Marchesi
2015-04-01 19:11                                                                   ` Harald Hanche-Olsen
2015-04-01 14:56                                                   ` Óscar Fuentes
2015-04-01 15:17                                                     ` Eli Zaretskii
2015-04-01 16:36                                                     ` Alan Mackenzie
2015-04-01 15:25                                                   ` Steinar Bang
2015-04-01 13:03                                               ` Sergey Organov
2015-04-01 15:10                                                 ` Eli Zaretskii
2015-04-01 15:52                                                   ` Sergey Organov
2015-04-01 16:18                                                     ` Eli Zaretskii
2015-04-02 12:27                                                       ` Sergey Organov
2015-04-02 12:50                                                         ` Harald Hanche-Olsen
2015-04-02 13:32                                                           ` Sergey Organov
2015-04-02 15:18                                                         ` Eli Zaretskii
2015-04-02 17:02                                                           ` Sergey Organov
2015-04-02 17:30                                                             ` Eli Zaretskii
2015-04-02 18:28                                                               ` Andreas Schwab
2015-04-02 19:11                                                                 ` Eli Zaretskii
2015-04-02 20:50                                                               ` Sergey Organov
2015-04-03  7:35                                                                 ` Eli Zaretskii
2015-04-03 14:43                                                                   ` Sergey Organov
2015-04-03 15:08                                                                     ` Eli Zaretskii
2015-04-02 22:40                                                               ` Stephen J. Turnbull
2015-04-03  7:12                                                                 ` Eli Zaretskii
2015-04-03  8:00                                                                   ` Stephen J. Turnbull
2015-04-03  8:28                                                                     ` Eli Zaretskii
2015-04-03 17:31                                                                       ` Stephen J. Turnbull
2015-04-03 21:21                                                                         ` Eli Zaretskii
2015-04-03 21:40                                                                           ` Sergey Organov
2015-04-04  7:29                                                                             ` Eli Zaretskii
2015-04-06 15:28                                                                               ` Sergey Organov
2015-04-03 22:41                                                                           ` Stephen J. Turnbull
2015-04-04  6:51                                                                             ` Steinar Bang
2015-04-04  7:40                                                                             ` Eli Zaretskii
2015-04-04  8:30                                                                               ` martin rudalics
2015-04-04  9:31                                                                                 ` Eli Zaretskii
2015-04-04 15:59                                                                                   ` martin rudalics
2015-04-04 16:39                                                                                     ` Eli Zaretskii
2015-04-04 22:58                                                                                       ` Stephen J. Turnbull
2015-04-05  7:02                                                                                         ` Eli Zaretskii
2015-04-05  8:44                                                                                           ` Stephen J. Turnbull
2015-04-05 12:28                                                                                             ` Eli Zaretskii
2015-04-05 18:45                                                                                               ` Stephen J. Turnbull
2015-04-05 19:05                                                                                                 ` Eli Zaretskii
2015-04-06 14:58                                                                                       ` martin rudalics
2015-04-07 17:09                                                                                         ` Eli Zaretskii
2015-04-08  7:05                                                                                           ` martin rudalics
2015-04-08  8:15                                                                                             ` Eli Zaretskii
2015-04-04 22:05                                                                                     ` Steinar Bang [this message]
2015-04-04 23:17                                                                                       ` Stephen J. Turnbull
2015-04-05  6:43                                                                                         ` Steinar Bang
2015-04-04 22:31                                                                                   ` Stephen J. Turnbull
2015-04-04 22:01                                                                               ` Stephen J. Turnbull
2015-04-05  6:58                                                                                 ` Eli Zaretskii
2015-04-05  8:31                                                                                   ` Stephen J. Turnbull
2015-04-05  8:57                                                                                     ` Eli Zaretskii
2015-04-05 17:36                                                                                       ` Stephen J. Turnbull
2015-04-05 17:50                                                                                         ` Eli Zaretskii
2015-04-05 17:42                                                                                     ` Richard Stallman
2015-04-05 18:06                                                                                       ` Eli Zaretskii
2015-04-05  9:55                                                                                   ` Harald Hanche-Olsen
2015-04-05 12:58                                                                                     ` Eli Zaretskii
2015-04-05  9:59                                                                                   ` Harald Hanche-Olsen
2015-04-04  8:59                                                                             ` Harald Hanche-Olsen
2015-04-04 21:04                                                                               ` Stephen J. Turnbull
2015-04-04 21:41                                                                                 ` Lele Gaifax
2015-04-04 23:14                                                                                   ` Stephen J. Turnbull
2015-04-05  8:27                                                                                     ` Lele Gaifax
2015-04-05  9:10                                                                                     ` Richard Stallman
2015-04-05 12:44                                                                                       ` Eli Zaretskii
2015-04-05 12:54                                                                                         ` Harald Hanche-Olsen
2015-04-05 13:02                                                                                           ` Eli Zaretskii
2015-04-05 13:12                                                                                             ` Eli Zaretskii
2015-04-05 13:17                                                                                               ` Harald Hanche-Olsen
2015-04-05 13:19                                                                                               ` Dmitry Gutov
2015-04-05 15:25                                                                                                 ` Eli Zaretskii
2015-04-05 17:42                                                                                               ` Richard Stallman
2015-04-05 17:56                                                                                                 ` Eli Zaretskii
2015-04-05 18:15                                                                                                 ` Eli Zaretskii
2015-04-03 11:04                                                                 ` Richard Stallman
2015-04-03 11:53                                                                   ` Eli Zaretskii
2015-04-03 17:35                                                                   ` Stephen J. Turnbull
2015-04-03 21:21                                                                     ` Sergey Organov
2015-04-04 14:46                                                                     ` Richard Stallman
2015-04-03 11:03                                                         ` Richard Stallman
2015-03-31 11:47                             ` Eli Zaretskii
2015-03-31 14:17                               ` Stephen J. Turnbull
2015-03-31 14:06                             ` Richard Stallman
2015-03-31 16:32                               ` Stephen J. Turnbull
2015-03-31  5:12                       ` Mike Gerwitz
2015-03-31 11:51                         ` Eli Zaretskii
2015-03-27 14:07               ` Dmitry Gutov
2015-03-27 14:17                 ` Eli Zaretskii
2015-03-27 14:57                   ` Dmitry Gutov
2015-03-27 15:16                     ` Eli Zaretskii
2015-03-27 15:33                       ` Dmitry Gutov
2015-03-27 15:37                         ` Eli Zaretskii
2015-03-27 17:10                           ` Dmitry Gutov
2015-03-27 18:58                             ` Eli Zaretskii
2015-03-28 16:17                               ` Richard Stallman
2015-03-27 15:16                     ` Sven Axelsson
2015-03-27 15:39                       ` Eli Zaretskii
2015-03-28 16:17                 ` Richard Stallman
2015-03-27 15:21               ` Daniel Colascione
2015-03-27 17:58               ` Steinar Bang
2015-03-28 16:15             ` Richard Stallman
2015-03-28 22:05               ` Stephen J. Turnbull
2015-03-29  2:44                 ` Eli Zaretskii
2015-03-29 14:33                 ` Richard Stallman
2015-03-29 15:09                   ` Eli Zaretskii
2015-03-29 18:05                     ` Stephen J. Turnbull
2015-03-29 18:30                       ` Eli Zaretskii
2015-03-30  0:50                         ` Stephen J. Turnbull
2015-03-30  2:41                           ` Eli Zaretskii
2015-03-29 17:53                   ` Stephen J. Turnbull
2015-03-31 14:02                     ` Richard Stallman
2015-03-24 21:59 ` Stefan Monnier
2015-03-25  1:22   ` Stephen J. Turnbull
2015-03-25  2:01     ` Eric S. Raymond
2015-03-25  4:18       ` Stephen J. Turnbull
2015-03-26 10:54   ` Richard Stallman
2015-03-26 13:28     ` Stefan Monnier
2015-03-26 14:36       ` David Engster
2015-03-26 13:31     ` Stefan Monnier
2015-03-25  8:40 ` Steinar Bang
2015-03-25 17:28   ` Eli Zaretskii
2015-03-26 17:54 ` Mark H Weaver

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=867ftr8s7s.fsf@dod.no \
    --to=sb@dod.no \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).