From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: [PATCH] GnuTLS support on Woe32 Date: Fri, 15 Apr 2011 21:23:02 +0300 Message-ID: <83ei53pe61.fsf@gnu.org> References: <87ipvwl1nx.wl%claudio.bley@gmail.com> <87hbbc0zi6.wl%claudio.bley@gmail.com> <83oc5gsdwc.fsf@gnu.org> <87ei6bunxz.wl%claudio.bley@gmail.com> <83tyf6rhgn.fsf@gnu.org> <84zkoy6tah.wl%claudio.bley@gmail.com> <87hbb5a4xq.fsf@lifelogs.com> <84ipvkx1da.wl%claudio.bley@gmail.com> <87d3ls7n3b.fsf@lifelogs.com> <87vczdwjuk.wl%claudio.bley@gmail.com> <87k4fr3koi.fsf@lifelogs.com> <87aagn2tpr.fsf@lifelogs.com> <87wrjquacf.fsf@lifelogs.com> <87lj05svwh.fsf@lifelogs.com> <87bp11imgb.wl%claudio.bley@gmail.com> <8739mc5nes.fsf@lifelogs.com> <87ipuubao6.fsf@lifelogs.com> <87fwpjfkkz.fsf@lifelogs.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1302891795 4949 80.91.229.12 (15 Apr 2011 18:23:15 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 15 Apr 2011 18:23:15 +0000 (UTC) Cc: emacs-devel@gnu.org To: Ted Zlatanov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Apr 15 20:23:11 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QAnfj-0004ra-BI for ged-emacs-devel@m.gmane.org; Fri, 15 Apr 2011 20:23:11 +0200 Original-Received: from localhost ([::1]:52661 helo=lists2.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAnfi-0007pR-KN for ged-emacs-devel@m.gmane.org; Fri, 15 Apr 2011 14:23:10 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:57190) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAnfg-0007os-47 for emacs-devel@gnu.org; Fri, 15 Apr 2011 14:23:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QAnff-00071n-6r for emacs-devel@gnu.org; Fri, 15 Apr 2011 14:23:08 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:40246) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QAnfe-00071h-V1 for emacs-devel@gnu.org; Fri, 15 Apr 2011 14:23:07 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0LJP00C00HGMIB00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Fri, 15 Apr 2011 21:23:04 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([84.229.191.204]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LJP00BR7HQFUTG0@a-mtaout22.012.net.il>; Fri, 15 Apr 2011 21:23:04 +0300 (IDT) In-reply-to: <87fwpjfkkz.fsf@lifelogs.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-Received-From: 80.179.55.172 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:138504 Archived-At: > From: Ted Zlatanov > Date: Fri, 15 Apr 2011 13:14:36 -0500 > > *sigh* one more rebase... If you have a separate branch (i.e. one that is not bound to the remote trunk), then you don't need to rebase at all. Just wait until the paperwork is done, and then simply merge from that branch onto your trunk mirror; then commit. Bazaar (and other dVCSs) does a much better job tracking changes in each branch, so merge conflicts are very rare, unless someone actually changes the same lines that you did.