From owner-freebsd-x11@freebsd.org Wed Apr 5 23:24:58 2017 Return-Path: Delivered-To: freebsd-x11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A0C0AD30AE9 for ; Wed, 5 Apr 2017 23:24:58 +0000 (UTC) (envelope-from mueller6722@twc.com) Received: from dnvrco-oedge-vip.email.rr.com (dnvrco-outbound-snat.email.rr.com [107.14.73.232]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "dnvrco-oedge-vip.email.rr.com", Issuer "dnvrco-oedge-vip.email.rr.com" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 7FBD295 for ; Wed, 5 Apr 2017 23:24:57 +0000 (UTC) (envelope-from mueller6722@twc.com) Received: from [74.134.208.22] ([74.134.208.22:55830] helo=localhost) by dnvrco-omsmta03 (envelope-from ) (ecelerity 3.6.9.48312 r(Core:3.6.9.0)) with ESMTP id BF/3D-25473-18C75E85; Wed, 05 Apr 2017 23:23:45 +0000 Date: Wed, 05 Apr 2017 23:23:18 +0000 Message-ID: From: "Thomas Mueller" To: freebsd-x11@freebsd.org CC: Andreas Nilsson , Doug Kirk Subject: Re: Switching branches of freebsd-base-graphics with git References: X-RR-Connecting-IP: 107.14.64.88:25 X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Apr 2017 23:24:58 -0000 from Doug Kirk: > `git pull` is just sugar for `git fetch` (fetch remote updates) then `git > merge` (merge them into the current work tree). > Since git pulls down the entire repo (unlike svn), `git checkout $branch` > is enough (AS LONG AS you originally cloned the entire repo instead of just > one branch -- `-b $branch` on the clone command). > So after the checkout as above, `git pull` should be enough to get the > currently checked-out branch's updates from the remote repo. > Even if you didn't clone the entire repo, `git checkout $branch` followed > by `git pull` is enough to checkout the branch and get its updates. > You can get a (local & remote) branch list with `git branch -a`. It'll show > a star for the current branch. > Also keep in mind that git won't do anything with non-tracked files, so > you'll likely want to `make clean` to get rid of prior-branch remnants. I ran "git branch -a" on this computer and the other, showed branches, but got more on this computer than the other: drm-next showed on this computer but not the other. I ran "git fetch remote", thinking I would update the list of branches, but got a bigger download. I am still in branch drm-i915-update-38 on that computer. So I am lost at this stage, only way I can see is rm -R * from /freebsd-base-graphics and start over with new branch. Now my head is spinning/swimming. I need to wait until after I finish my income tax return. Tom