From owner-freebsd-x11@freebsd.org Wed Apr 5 09:05:56 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 9AA01D2E291 for ; Wed, 5 Apr 2017 09:05:56 +0000 (UTC) (envelope-from andrnils@gmail.com) Received: from mail-vk0-x235.google.com (mail-vk0-x235.google.com [IPv6:2607:f8b0:400c:c05::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 649F5838 for ; Wed, 5 Apr 2017 09:05:56 +0000 (UTC) (envelope-from andrnils@gmail.com) Received: by mail-vk0-x235.google.com with SMTP id z204so3591268vkd.1 for ; Wed, 05 Apr 2017 02:05:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=G46/JCGGTPqfq34VfI7oH4YcAhHAyrUmUfA+blRQhpM=; b=mDSq15cFT7DjeyPpEdcQ8YJwKLB2PbskZfK5s4dFnDVi0GrLua5t3WOMIk5+8CvjY3 sB2lPvetyc7mr/n59aw7b9u8mJv1w1hDXIqUZy84ckRmOJOP8rRcNlWLBuiDJRWqfK67 ZOIQks0gj1MMucZSC4aKPLFIydnvOC24bpQiq2cvDq4x5Cew1RVr1fFCSHKZ96SLVYxz axarRXrsoYJcj2aArMnjgwkF7J7P7c+MHV4IzM3t7iuYxVxcw2GQSOKZYVRYscKOLaMi nC992fNn+b2ZTs0HaBSnhOpE1NONssL8eThj9E5w1uVr3iHAHOT/QnFEZV3IxOYR19Bj iaOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=G46/JCGGTPqfq34VfI7oH4YcAhHAyrUmUfA+blRQhpM=; b=t7uSIWrXjKMXvKGqRJBRY5FjWLbq0fB7sXqf+oPGvYgaKVf4UWlnTvqjeiI0Pazjiq 9nwWWcm+xZC8LPRxSpJU6W4i9skhvB6IgS/CqeSWDuCD9fadr/Wp11fA9vt0Xd4DX/sU GJWtxGIbOO9RaQduDj2+xDVlHIwHfNnrAWWnshZQKpXtUOtWlCU37mRAz/cthabuCvya /aZ2nD96PAEUOP/jB/dz9na6ws+moMi4uGMbQW0Hogbgk3aFlotXdEhyE4y95Gv3thdX rPtfZNVVi+jBy72T8ah/iVVDNj8sQVkKG2exYVeWyh21yUaAO1dFFrPbFyJ2tLgqNUDw ZdAg== X-Gm-Message-State: AFeK/H0uKGidWXHccOmvH/nMPR6U+/HSokBxFT/1pXdi27bpXlVPCRpUBo2EOS6KFgQNU4813jVQHSAQozdefw== X-Received: by 10.31.210.132 with SMTP id j126mr11806957vkg.95.1491383154244; Wed, 05 Apr 2017 02:05:54 -0700 (PDT) MIME-Version: 1.0 Received: by 10.159.37.241 with HTTP; Wed, 5 Apr 2017 02:05:53 -0700 (PDT) In-Reply-To: References: From: Andreas Nilsson Date: Wed, 5 Apr 2017 11:05:53 +0200 Message-ID: Subject: Re: Switching branches of freebsd-base-graphics with git To: Thomas Mueller Cc: FreeBSD X11 mailing list Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.23 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 09:05:56 -0000 On Wed, Apr 5, 2017 at 9:33 AM, Thomas Mueller wrote: > I tried to switch freebsd-base-graphics tree from drm-3.8 (something like > that, now outdated to drm-next and made a mess. > > First, from /freebsd-base-graphics, I did > git checkout drm-next > but then git pull didn't work, I got message about not having repository. > > "git checkout drm-next" switched branches but didn't download anything, > hence my try with "git pull". > > After some struggle, I did > git clone https://github.com/FreeBSDDesktop/freebsd-base-graphics.git -b > drm-next > > from /freebsd-base-graphics directory, but that resuted in the tree being > downloaded to /freebsd-base-graphics/freebsd-base-graphics > > I recovered by renaming (mv) /freebsd-base-graphics to > /freebsd-base-graphics-old, then moved /freebsd-base-graphics-old/freebsd-base-graphics > to / > and then, with the new stuff separated from the old, > rm -R /freebsd-base-graphics-old > > That seemed to work, inelegantly. > > Question is how to switch the branch and download the new branch over the > old, like "svn sw", but with git. > > I looked through the documentation, even went to git-scm.org, even a PDF > book "Jump-Start Git" but still couldn't see what I should have done. > > There has to be a simpler way, but I couldn't find it in the documentation > of git. > > Tom > > _______________________________________________ > freebsd-x11@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-x11 > To unsubscribe, send any mail to "freebsd-x11-unsubscribe@freebsd.org" > Hello! I've switched branches a few time to keep track of progress and going from 11-STABLE to 12-CURRENT. I did git fetch ( this fetch info on new branches and code and so on ) git checkout $branch git pull Subsequent upgrades are done with git fetch git pull I'm by no means a git expert, so please correct me if I'm wrong. Best reagards Andreas