From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: John Wiegley Newsgroups: gmane.emacs.devel Subject: Re: git flow for emacs master/emacs-25 Date: Mon, 16 Nov 2015 08:59:48 -0800 Message-ID: References: <86ziyg9ny9.fsf@stephe-leake.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1447720746 10426 80.91.229.3 (17 Nov 2015 00:39:06 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 17 Nov 2015 00:39:06 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stephen Leake Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 17 01:39:00 2015 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 1ZyUII-0006zp-I3 for ged-emacs-devel@m.gmane.org; Tue, 17 Nov 2015 01:38:46 +0100 Original-Received: from localhost ([::1]:53247 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZyUII-0004l5-01 for ged-emacs-devel@m.gmane.org; Mon, 16 Nov 2015 19:38:46 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50303) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZyN8m-0007Tl-Dn for emacs-devel@gnu.org; Mon, 16 Nov 2015 12:00:31 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZyN8g-0001rL-AF for emacs-devel@gnu.org; Mon, 16 Nov 2015 12:00:28 -0500 Original-Received: from mail-pa0-x236.google.com ([2607:f8b0:400e:c03::236]:34861) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZyN8g-0001rG-58 for emacs-devel@gnu.org; Mon, 16 Nov 2015 12:00:22 -0500 Original-Received: by pacej9 with SMTP id ej9so73714027pac.2 for ; Mon, 16 Nov 2015 09:00:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:in-reply-to:date:message-id:references :user-agent:mail-followup-to:mime-version:content-type; bh=ewEJBio4I5qS78wBddQ9i6NrzlmyBtbnxd+IZ4kFquw=; b=nYHMtZcJ+s82YiSbs2afFjBBK9adNWEb8rz/yJWJqu0iUeYQ8hFnAbj98jJU+vJgQR WlWPxDYZ1OxR9Cq7Bm9hNc7gwu6VoRIHmpMXuNUgiASkRV7v4oexjAF2e5wJ8WBgE/Wi tsd14bUxAFAWgO7gb22hfsZe5yrhIN/HaQr6ycDHmN2/LrtOboSeJ4eDhvxxijgYU2xc c/6kJ48fiAZXjsTeM1GO3XitfHA5GyVT6N2gi1okXxQYaFXXhQhiTFdV37xjHdiGFcL9 AEJqUXeFq6Tyx7c7rtXjj5For/wUbsm3MRwHkulV2dTnm8jCYUAk6k97sQ/0ZfaJI5s7 DY8w== X-Received: by 10.68.178.1 with SMTP id cu1mr57143013pbc.115.1447693221678; Mon, 16 Nov 2015 09:00:21 -0800 (PST) Original-Received: from Vulcan.attlocal.net (76-234-68-79.lightspeed.frokca.sbcglobal.net. [76.234.68.79]) by smtp.gmail.com with ESMTPSA id sn9sm37728520pac.16.2015.11.16.09.00.18 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 16 Nov 2015 09:00:19 -0800 (PST) X-Google-Original-From: "John Wiegley" Original-Received: by Vulcan.attlocal.net (Postfix, from userid 501) id E759F105DEB6C; Mon, 16 Nov 2015 09:00:17 -0800 (PST) In-Reply-To: <86ziyg9ny9.fsf@stephe-leake.org> (Stephen Leake's message of "Sat, 14 Nov 2015 17:10:54 -0600") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (darwin) Mail-Followup-To: Stephen Leake , emacs-devel@gnu.org X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::236 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:194598 Archived-At: >>>>> Stephen Leake writes: > The "git fetch" in master shows the new commits in emacs-25. > But the "git fetch" in emacs-25 doesn't fetch the commits. Your local clone only fetches from the remote commits it knows about, which would be every local branch in the original repository. The original repository fetches from every remote commit it knows about, which are all the branches up on Savannah. Try looking at git branch -av in both repositories, and it should become clear. Also, you don't only need the local branch in the original repository tracking the Savannah branch, you need to *update* that local branch before your local clone will see the new commits from savannah. I think you'll be much happier with "git worktree", or with two separate clones from Savannah, that you will be with the clone you've already made. John