[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: master 7f4f16b: Merge branch 'master' of git.sv.gnu.org:/srv/git/ema

From: Paul Eggert
Subject: Re: master 7f4f16b: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Date: Tue, 27 Jan 2015 23:16:02 -0800
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0

Lars Ingebrigtsen wrote:
How did that happen?  I thought I was in either the master branch, or
the shr-fontified branch.  I didn't try to do anything with the emacs-24

Oh, sorry, I guess I misinterpreted the logs and Fabián did the merges (actually, merges) at about the same time? But your name is on one of the master-installed merges as the committer, so I'm puzzled. Whatever. Anyway, the merges had quite a few conflicts that were resolved incorrectly.

Did anything leak into the master that you didn't want? The nnimap `never' expiration fix, say? (Commit 0cdd599c54aeda36e7e0696b2f90d2c286153a1d.) Or the shr-make-table-1 patches (commits 1a369fc7f1ccec6954344ec1ee0211a4d24c312d and 776705f49c5cb4e66c7dcb316fe499aa6a183888)? If so, now might be a good time to revert these.

As a general rule, by the way, I almost never do anything other than "git pull" when I'm in my working copy of the Emacs master. To do any real work, I clone that copy and work in some temporary branch in that clone. Eventually when I have a patch I'm happy with, I use "git format-patch" to create a patch file, review the patch file, and then finally go to my copy of the master and publish the patch via "git am PATCHFILE; git push". This lessens the likelihood of my inadvertently pushing something to savannah's master.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]