Mail archive
alpine-devel

Re: [alpine-devel] seeking advice of build automation and keeping git synced

From: Steffen Nurpmeso <steffen_at_sdaoden.eu>
Date: Tue, 19 Feb 2019 14:05:57 +0100

scrumpyjack_at_st.ilet.to wrote in <20190219085953.GD14592_at_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_at_lists.alpinelinux.org
Help:         alpine-devel+help_at_lists.alpinelinux.org
---
Received on Tue Feb 19 2019 - 14:05:57 UTC