From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Kaushal Modi Newsgroups: gmane.emacs.devel Subject: Re: SOLVED Date: Thu, 05 May 2016 21:33:11 +0000 Message-ID: References: <87vb2wi60p.fsf@mat.ucm.es> <87zis4g925.fsf@mat.ucm.es> <877ff8cjqg.fsf@mat.ucm.es> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=089e0149bff659f12e05321f1777 X-Trace: ger.gmane.org 1462484066 14515 80.91.229.3 (5 May 2016 21:34:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 5 May 2016 21:34:26 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu May 05 23:34:11 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ayQuO-0006f9-JA for ged-emacs-devel@m.gmane.org; Thu, 05 May 2016 23:34:08 +0200 Original-Received: from localhost ([::1]:55449 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ayQuH-0001eG-EU for ged-emacs-devel@m.gmane.org; Thu, 05 May 2016 17:34:01 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52741) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ayQu7-0001Nr-J3 for emacs-devel@gnu.org; Thu, 05 May 2016 17:33:57 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ayQtv-0007Ud-Kk for emacs-devel@gnu.org; Thu, 05 May 2016 17:33:46 -0400 Original-Received: from mail-ob0-x230.google.com ([2607:f8b0:4003:c01::230]:35378) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ayQtu-0007OD-DJ for emacs-devel@gnu.org; Thu, 05 May 2016 17:33:39 -0400 Original-Received: by mail-ob0-x230.google.com with SMTP id n10so43122931obb.2 for ; Thu, 05 May 2016 14:33:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=gm92ni8nnoscmQXZnWKghZt302a7cGObO6QLkwLtq24=; b=Y43mN7phvYYoJlWiCR4eL3imNNSU4POxVdgD5/cBN1mWx2guCo81cHuSBG8JjYBGtF RZSqDrt5ZoIOaSHadrG3DItlY6bubi7KEcAWebXGQSHvj9XWKrSJEP87cHVd3ZwlyEor fWBKbYvcSdVvej3OhEAeJo1jesXnLvFzOCWq1KqvUtF7pqy1DjvUjrer9JdarfoWYnQR CQFheJvkhnf4p23ymAw1llAy1ixb4bYlxCIlgMnQuhfzhuXCrioferTRkMfQae1vohTu DX1VTmLmGPng7fVpfdRWLdKLuPAkFfjzhy8ytLrqLKrFfhTmecJpLJgX6WpJlX/bVOwW oYXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=gm92ni8nnoscmQXZnWKghZt302a7cGObO6QLkwLtq24=; b=iN/GEJmX3FSEwudDUqbQOVHuwipxx7jA5+tvW5rNJZAoECIbZnqxuwR/JIkUzIW7kC HPY+/3bIPgSUx7/FHmOCiC8DRx4HyD/0r6yN1T0ZR6xqx9xqrCdMn4jt3MoDVmmiepmP f14SFBtXbHhEOCiIjGKjcA7tgJJ9RxycE39EefvcsEtLpbBkX8rC8Heq6t/vS4pJoNjs E1EloziDH+sGJGqXnclIxF1b38o9S4iB70QalU5TIxGPcvigke+DFim0SwQxZmtXv1rP JPVtJkIQb6s/wDtbo3TVI6LhAO+uBInhbJiAd9APmQEAcxPahaiHpxCb+JNHngdRfBq6 c2gA== X-Gm-Message-State: AOPr4FXwoiws45itehzS0fC7NXmQ2bx6CYhTudseh5YIP5V2AoQiQE4NLw1B3vE8k4wT8S7jmTVu7RFIDdepbw== X-Received: by 10.182.224.137 with SMTP id rc9mr8104416obc.39.1462484000696; Thu, 05 May 2016 14:33:20 -0700 (PDT) In-Reply-To: <877ff8cjqg.fsf@mat.ucm.es> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4003:c01::230 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:203621 Archived-At: --089e0149bff659f12e05321f1777 Content-Type: text/plain; charset=UTF-8 Hi Uwe, I am using Google Inbox to write emails. I apologize for the email format as I don't know what I can do to fix this. This is what it looks like to me when I am writing the email: http://i.imgur.com/oYhaTHg.png > I just followed your instructions of your other mail to rebase to > emacs-25, but Daniels changes are not there. > > His changes seem only to be in emacs-master. (I am sorry I am not very > familiar with git, for my personal stuff I use hg and I use even the > git-hg plugin to maintain matlab, but I don't dare to do that for > emacs...) > Sorry for creating this confusion. You are correct; those changes to vc-hg ( http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=de76a167dc09dc695a5acebabb7ab354a6bf556e ) are only in the master branch. So there is no point sending a patch rebased to emasc-25. I had incorrectly assumed that your documentation patch could apply to emacs-25 too. So just rebase to the master branch using the below. git fetch --all git checkout master git reset --hard origin/master Then format your patch and send it to bug-gnu-emacs@gnu.org. -- -- Kaushal Modi --089e0149bff659f12e05321f1777 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Hi Uwe,

I am using Google Inbox to write emails. I apologize for the email f= ormat as I don't know what I can do to fix this. This is what it looks = like to me when I am writing the email:=C2=A0http://i.imgur.com/oYhaTHg.png
=C2=A0
I just followed your instructions of your other ma= il to rebase to
emacs-25, but Daniels changes are not there.
=C2=A0
http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=3Dde76a16= 7dc09dc695a5acebabb7ab354a6bf556e=C2=A0) are only in the master branch.= So there is no point sending a patch rebased to emasc-25. I had incorrectl= y assumed that your documentation patch could apply to emacs-25 too.
<= div>
So just rebase to the master branch using the below.

git fetch --all
git checkout master
git reset --hard origin/master

Then format your= patch and send it to bug-gnu-emac= s@gnu.org.
--

--
Kaushal Modi

--089e0149bff659f12e05321f1777--