X-Original-To: alpine-devel@lists.alpinelinux.org Received: from sdaoden.eu (sdaoden.eu [217.144.132.164]) by lists.alpinelinux.org (Postfix) with ESMTP id 1E09DF815F1 for ; Tue, 19 Feb 2019 13:05:58 +0000 (UTC) Received: by sdaoden.eu (Postfix, from userid 1000) id 8713F1604A; Tue, 19 Feb 2019 14:05:55 +0100 (CET) Date: Tue, 19 Feb 2019 14:05:57 +0100 From: Steffen Nurpmeso To: scrumpyjack@st.ilet.to Cc: alpine-devel@lists.alpinelinux.org, Robert Hencke Subject: Re: [alpine-devel] seeking advice of build automation and keeping git synced Message-ID: <20190219130557.7CEJ8%steffen@sdaoden.eu> In-Reply-To: <20190219085953.GD14592@stiletto> References: <20190218102658.GA14592@stiletto> <20190219085953.GD14592@stiletto> Mail-Followup-To: scrumpyjack@st.ilet.to, alpine-devel@lists.alpinelinux.org, Robert Hencke User-Agent: s-nail v14.9.11 OpenPGP: id=EE19E1C1F2F7054F8D3954D8308964B51883A0DD; url=https://ftp.sdaoden.eu/steffen.asc; preference=signencrypt BlahBlahBlah: Any stupid boy can crush a beetle. But all the professors in the world can make no bugs. X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: scrumpyjack@st.ilet.to wrote in <20190219085953.GD14592@stiletto>: |On Mon, Feb 18, 2019 at 08:39:18PM -0500, Robert Hencke wrote: |> |>If I understand correctly, what you want is a process that takes the \ |>latest |>work from your repository, combines it with the latest work on xeyes in |>sports, and builds the result? | |hi Robert, thanks for asking. Here is a better description: | |I make changes to my local xeyes repo, and drone builds the package when I |push the changes. A patch gets created on successfull build and gets \ |emailed |to alpine-aports. | |The patch then gets applied to xeyes in the aports tree | |At this point both xeyes are identical. | |But if you, Robert, modify the xeyes package in the aports tree, i \ |need a way |to pull those changes into my local xeyes repo automatically, so that \ |they are |always in sync. | |Does that make sense? Either "rebase --onto UPSTREAM MYCHANGES-FIRST^ MYCHANGES" or look out for the git "rerere" command, but which i have never used myself. Merge conflicts can still happen of course, i would then "rebase --abort", stop the automated process and send me a mail. --steffen | |Der Kragenbaer, The moon bear, |der holt sich munter he cheerfully and one by one |einen nach dem anderen runter wa.ks himself off |(By Robert Gernhardt) --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---