From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.devel Subject: Re: master c6f03ed: Fix a problem in url.el without GnuTLS Date: Fri, 19 Dec 2014 11:33:25 +0100 Organization: Probably a good idea Message-ID: References: <20141211155740.11916.1584@vcs.savannah.gnu.org> <87bnn7rkcq.fsf@engster.org> <877fxvri96.fsf@engster.org> <87zjarznzs.fsf@lifelogs.com> <87sigjpri2.fsf@engster.org> <838uib60jv.fsf@gnu.org> <87mw6rpc6l.fsf@engster.org> <83sigj48z5.fsf@gnu.org> <874mszp2i7.fsf@engster.org> <83iohe43hu.fsf@gnu.org> <87vbldoqp2.fsf@engster.org> <83a92py3p3.fsf@gnu.org> <87mw6oodep.fsf@engster.org> <83lhm7wfd4.fsf@gnu.org> <87egrynhcd.fsf@engster.org> <87wq5pd0ap.fsf@uwakimon.sk.tsukuba.ac.jp> <83fvcdufv9.fsf@gnu.org> <87r3vwk9tr.fsf@dod.no> <83lhm4u1y3.fsf@gnu.org> <8361d8t2ws.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1418985243 29280 80.91.229.3 (19 Dec 2014 10:34:03 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 19 Dec 2014 10:34:03 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 19 11:33:59 2014 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 1Y1usf-0003mx-KM for ged-emacs-devel@m.gmane.org; Fri, 19 Dec 2014 11:33:57 +0100 Original-Received: from localhost ([::1]:57746 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1usf-0007Tt-4j for ged-emacs-devel@m.gmane.org; Fri, 19 Dec 2014 05:33:57 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51006) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1usW-0007R0-Il for emacs-devel@gnu.org; Fri, 19 Dec 2014 05:33:53 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y1usR-0002RH-CE for emacs-devel@gnu.org; Fri, 19 Dec 2014 05:33:48 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:55917) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1usR-0002Qm-4z for emacs-devel@gnu.org; Fri, 19 Dec 2014 05:33:43 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Y1usP-0003do-3S for emacs-devel@gnu.org; Fri, 19 Dec 2014 11:33:41 +0100 Original-Received: from steria10.steria.no ([195.204.41.10]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 19 Dec 2014 11:33:41 +0100 Original-Received: from sb by steria10.steria.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 19 Dec 2014 11:33:41 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 21 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: steria10.steria.no Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.3 (windows-nt) Cancel-Lock: sha1:56C3GsH5+F6igrtCk3+GWKVQK9M= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:180325 Archived-At: >>>>> Eli Zaretskii : > What do you mean by "version number stuff"? The version of the package itself (eg. AC_INIT in configure.ac and the line in the README file), and versions of dependencies. Stuff like the AC_INIT line will usually be taken care of in the first merge, however if the configure.ac is changed for some reason on the emacs-24 branch, one should examine the merge results. Git tries to be clever in merges, and usually manages to be so, but I've seen it fail in cases like this (ie. making changes in the file containing a package's version number). And in a staged-but-uncommitted merge in magit, the workflow is simple and emacs-ish: - Edit configure.ac (fix the AC_INIT line and keep the rest) - 'C-x v =' to check the diff - Go back to magit ('q' to close the vc diff, 'C-x b RET' from the source file) the unstaged version of the file ('s' in front of the file) - In magit 'c c' to commit the merge