merging upstream changes into my local propellor repo

When there were upstream changes available, propellor used to prompt me to merge upstream changes into my local propellor repo with:

git merge upstream/master

Of late, propellor has not been prompting me to merge upstream changes and my local propellor repo is stuck at ~version 5.3.5

Is there is (another manual) way to merge upstream changes into my local propellor repo?

My propellor repo is at

git clone git://git.ricketyspace.net/propellor.git

Note that I've have some minor updates under the src/ directory. Some of them were merged into upstream.

RSS

comment 1

The upstream/master thing is probably propellor's code looking in /usr/src/propellor for a new upstream version.

Do you perhaps no longer have the Debian package of propellor installed?

Comment by spwhitton — Sun Jun 2 00:34:48 2019

Remove comment

comment 2

@spwhitton, My current host machine is OpenBSD. So, I get propellor from cabal.

Currently I've propellor 5.8.0 installed from cabal.

My local propellor repo is itself is stuck at 5.3.5 (https://git.ricketyspace.net/propellor/files.html).

I wanted to know if there was a way to manually merge upstream changes into my local propellor repo?

Comment by s — Sun Jun 2 01:10:43 2019

Remove comment

comment 3

You can always just fetch and merge upstream's release tags.

Comment by spwhitton — Mon Jun 3 03:43:33 2019

Remove comment

comment 4

@spwhitton, Sorry I should've mentioned it before. I've already tried merging upstream changes using git merge, I'm unable to merge it due to different commit histories:

cygnus$ git remote -v           
s       g@git.rs:~/c/propellor.git (fetch)
s       g@git.rs:~/c/propellor.git (push)
u       git://propellor.branchable.com/propellor (fetch)
u       git://propellor.branchable.com/propellor (push)


cygnus$ git tag -l | grep 5.8.0
5.8.0

cygnus$ git merge 5.8.0
fatal: refusing to merge unrelated histories
cygnus$ git merge u/master
fatal: refusing to merge unrelated histories

First commit in upstream repo:

cygnus$ git log --reverse u/master | head -n 5
commit d9af8bac5eb7836a3c90e37e870fd73d30b841fd
Author: Joey Hess <joey@kitenet.net>
Date:   Sat Mar 29 23:10:52 2014 -0400

    initial check-in

First commit in my repo:

cygnus$ git log --reverse s/master | head -n 5 
commit ff6173d6cd45e383da0f315bc80b52d486306cbc
Author: build <build@buildhost>
Date:   Tue Nov 22 14:16:29 2016 -0700

    distributed version of propellor

Comment by s — Tue Jun 4 00:38:58 2019

Remove comment

comment 5

You can pass -X theirs --allow-unrelated-histories or similar.

Comment by spwhitton — Wed Jun 5 15:08:02 2019

Remove comment

comment 6

@spwhitton, Thank you very much. That worked!

Comment by s — Thu Jun 6 03:00:43 2019

Remove comment

comment 7

Documenting it (in case there is another user who wishes to do the same):

Add upstream repo and fetch tags:

$ cd ~/.propellor

$ git remote add u git://propellor.branchable.com/propellor
$ git fetch u --tags

Look for the list releases:

$ git tag -l
0.1
0.1.1
0.1.2
0.2.0
0.2.1
...
...
...
X.Y.Z

To merge release X.Y.Z into your master branch, do:

$ git merge -X theirs --allow-unrelated-histories X.Y.Z

Fix any conflicts and:

$ git commit

Comment by s — Thu Jun 6 03:13:02 2019

Remove comment

comment 8

The git:// protocol is unencrypted and unauthenticated and you're not verifying Joey's PGP signature on the tag that you merge, so this approach is dangerous.

I would insert a git verify-tag step in there. You'd want to make a record of (and perhaps locally sign) Joey's PGP key.

Comment by spwhitton — Sat Jun 8 20:21:57 2019

Remove comment

comment 9

Thanks again @spwhitton. I've verified the tag with Joey's GPG keys.

Documenting here:

Get Joey's GPG keys

gpg2 --recv-keys  'E85A 5F63 B31D 24C1 EBF0 D81C C910 D922 2512 E3C7'

Verify the release tag before merging it into your local repo:

cd ~/.propellor
git verify-tag X.Y.Z

Comment by s — Sat Jun 15 16:04:22 2019

Remove comment

Add a comment