From c55dff8a1db9afd3c7705c6ba105224b620c4381 Mon Sep 17 00:00:00 2001 From: spwhitton Date: Sun, 2 Jun 2019 00:34:48 +0000 Subject: Added a comment --- .../comment_1_e522e00ee4d4b072d80faef748450a52._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_1_e522e00ee4d4b072d80faef748450a52._comment (limited to 'doc/forum/merging_upstream_changes_into_my_local_propellor_repo') diff --git a/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_1_e522e00ee4d4b072d80faef748450a52._comment b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_1_e522e00ee4d4b072d80faef748450a52._comment new file mode 100644 index 00000000..3c3623de --- /dev/null +++ b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_1_e522e00ee4d4b072d80faef748450a52._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="spwhitton" + avatar="http://cdn.libravatar.org/avatar/9c3f08f80e67733fd506c353239569eb" + subject="comment 1" + date="2019-06-02T00:34:48Z" + content=""" +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? +"""]] -- cgit v1.2.3 From c4f893b9e73e5c50387349929baa224ff60c1434 Mon Sep 17 00:00:00 2001 From: s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd Date: Sun, 2 Jun 2019 01:10:43 +0000 Subject: Added a comment --- .../comment_2_3dcd6f95340abed0accfecda716fd1f6._comment | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_2_3dcd6f95340abed0accfecda716fd1f6._comment (limited to 'doc/forum/merging_upstream_changes_into_my_local_propellor_repo') diff --git a/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_2_3dcd6f95340abed0accfecda716fd1f6._comment b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_2_3dcd6f95340abed0accfecda716fd1f6._comment new file mode 100644 index 00000000..d59d2ca9 --- /dev/null +++ b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_2_3dcd6f95340abed0accfecda716fd1f6._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd" + nickname="s" + avatar="http://cdn.libravatar.org/avatar/81bf27f8b35011d1846711fa37a5588f" + subject="comment 2" + date="2019-06-02T01:10:43Z" + content=""" +[@spwhitton](https://propellor.branchable.com/user/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 (). + +I wanted to know if there was a way to manually merge upstream changes into my local propellor repo? + +"""]] -- cgit v1.2.3 From 6825bfdf75009428b1babf73f5a7986b30728835 Mon Sep 17 00:00:00 2001 From: spwhitton Date: Mon, 3 Jun 2019 03:43:33 +0000 Subject: Added a comment --- .../comment_3_a273b2f5a904e7b16576a750538296dc._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_3_a273b2f5a904e7b16576a750538296dc._comment (limited to 'doc/forum/merging_upstream_changes_into_my_local_propellor_repo') diff --git a/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_3_a273b2f5a904e7b16576a750538296dc._comment b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_3_a273b2f5a904e7b16576a750538296dc._comment new file mode 100644 index 00000000..b2043e80 --- /dev/null +++ b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_3_a273b2f5a904e7b16576a750538296dc._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="spwhitton" + avatar="http://cdn.libravatar.org/avatar/9c3f08f80e67733fd506c353239569eb" + subject="comment 3" + date="2019-06-03T03:43:33Z" + content=""" +You can always just fetch and merge upstream's release tags. +"""]] -- cgit v1.2.3 From c026e0c3c54814a58e96fa3819b225376ec48b75 Mon Sep 17 00:00:00 2001 From: s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd Date: Tue, 4 Jun 2019 00:38:58 +0000 Subject: Added a comment --- ...ent_4_26738f91fe511b49552a68e70f201059._comment | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_4_26738f91fe511b49552a68e70f201059._comment (limited to 'doc/forum/merging_upstream_changes_into_my_local_propellor_repo') diff --git a/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_4_26738f91fe511b49552a68e70f201059._comment b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_4_26738f91fe511b49552a68e70f201059._comment new file mode 100644 index 00000000..ca112817 --- /dev/null +++ b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_4_26738f91fe511b49552a68e70f201059._comment @@ -0,0 +1,49 @@ +[[!comment format=mdwn + username="s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd" + nickname="s" + avatar="http://cdn.libravatar.org/avatar/81bf27f8b35011d1846711fa37a5588f" + subject="comment 4" + date="2019-06-04T00:38:58Z" + content=""" +[@spwhitton](spwhittonhttps://propellor.branchable.com/user/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 +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 +Date: Tue Nov 22 14:16:29 2016 -0700 + + distributed version of propellor + +``` +"""]] -- cgit v1.2.3 From 3b6f3db257cd4471324ecb98e056598dc4b9bd82 Mon Sep 17 00:00:00 2001 From: spwhitton Date: Wed, 5 Jun 2019 15:08:02 +0000 Subject: Added a comment --- .../comment_5_05439bebb8c0dee0850fb2ffe3e117c3._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_5_05439bebb8c0dee0850fb2ffe3e117c3._comment (limited to 'doc/forum/merging_upstream_changes_into_my_local_propellor_repo') diff --git a/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_5_05439bebb8c0dee0850fb2ffe3e117c3._comment b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_5_05439bebb8c0dee0850fb2ffe3e117c3._comment new file mode 100644 index 00000000..2b169a57 --- /dev/null +++ b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_5_05439bebb8c0dee0850fb2ffe3e117c3._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="spwhitton" + avatar="http://cdn.libravatar.org/avatar/9c3f08f80e67733fd506c353239569eb" + subject="comment 5" + date="2019-06-05T15:08:02Z" + content=""" +You can pass `-X theirs --allow-unrelated-histories` or similar. +"""]] -- cgit v1.2.3 From 35bf7c3196e0b98a65388e4affc7f5819f09caaa Mon Sep 17 00:00:00 2001 From: s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd Date: Thu, 6 Jun 2019 03:00:44 +0000 Subject: Added a comment --- .../comment_6_c7f1e82b71c3317a25230e076eb0a330._comment | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_6_c7f1e82b71c3317a25230e076eb0a330._comment (limited to 'doc/forum/merging_upstream_changes_into_my_local_propellor_repo') diff --git a/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_6_c7f1e82b71c3317a25230e076eb0a330._comment b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_6_c7f1e82b71c3317a25230e076eb0a330._comment new file mode 100644 index 00000000..eadab877 --- /dev/null +++ b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_6_c7f1e82b71c3317a25230e076eb0a330._comment @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd" + nickname="s" + avatar="http://cdn.libravatar.org/avatar/81bf27f8b35011d1846711fa37a5588f" + subject="comment 6" + date="2019-06-06T03:00:43Z" + content=""" +[@spwhitton](https://propellor.branchable.com/user/spwhitton/), Thank you very much. That worked! +"""]] -- cgit v1.2.3 From 23c5587e60cc1b3de6c74f94b0f924344ef93cec Mon Sep 17 00:00:00 2001 From: s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd Date: Thu, 6 Jun 2019 03:13:02 +0000 Subject: Added a comment --- ...ent_7_de411d55ffbd72c5a4182168dead6b29._comment | 46 ++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_7_de411d55ffbd72c5a4182168dead6b29._comment (limited to 'doc/forum/merging_upstream_changes_into_my_local_propellor_repo') diff --git a/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_7_de411d55ffbd72c5a4182168dead6b29._comment b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_7_de411d55ffbd72c5a4182168dead6b29._comment new file mode 100644 index 00000000..9f6afc6b --- /dev/null +++ b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_7_de411d55ffbd72c5a4182168dead6b29._comment @@ -0,0 +1,46 @@ +[[!comment format=mdwn + username="s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd" + nickname="s" + avatar="http://cdn.libravatar.org/avatar/81bf27f8b35011d1846711fa37a5588f" + subject="comment 7" + date="2019-06-06T03:13:02Z" + content=""" +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 +``` + +"""]] -- cgit v1.2.3 From fd4cd21388dc40d28af500902655976de137afd6 Mon Sep 17 00:00:00 2001 From: spwhitton Date: Sat, 8 Jun 2019 20:21:57 +0000 Subject: Added a comment --- .../comment_8_ba9fabe0096cd8808c4a50ea3ebe543c._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_8_ba9fabe0096cd8808c4a50ea3ebe543c._comment (limited to 'doc/forum/merging_upstream_changes_into_my_local_propellor_repo') diff --git a/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_8_ba9fabe0096cd8808c4a50ea3ebe543c._comment b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_8_ba9fabe0096cd8808c4a50ea3ebe543c._comment new file mode 100644 index 00000000..b1344a10 --- /dev/null +++ b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_8_ba9fabe0096cd8808c4a50ea3ebe543c._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="spwhitton" + avatar="http://cdn.libravatar.org/avatar/9c3f08f80e67733fd506c353239569eb" + subject="comment 8" + date="2019-06-08T20:21:57Z" + content=""" +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. +"""]] -- cgit v1.2.3 From 9571648e940e9d84cef6986abe1b4a955afe5fdb Mon Sep 17 00:00:00 2001 From: s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd Date: Sat, 15 Jun 2019 16:04:22 +0000 Subject: Added a comment --- ...ent_9_49c03760f833632a50b88be792395a5f._comment | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_9_49c03760f833632a50b88be792395a5f._comment (limited to 'doc/forum/merging_upstream_changes_into_my_local_propellor_repo') diff --git a/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_9_49c03760f833632a50b88be792395a5f._comment b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_9_49c03760f833632a50b88be792395a5f._comment new file mode 100644 index 00000000..94d697fd --- /dev/null +++ b/doc/forum/merging_upstream_changes_into_my_local_propellor_repo/comment_9_49c03760f833632a50b88be792395a5f._comment @@ -0,0 +1,25 @@ +[[!comment format=mdwn + username="s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd" + nickname="s" + avatar="http://cdn.libravatar.org/avatar/81bf27f8b35011d1846711fa37a5588f" + subject="comment 9" + date="2019-06-15T16:04:22Z" + content=""" +Thanks again [@spwhitton](https://propellor.branchable.com/user/spwhitton/). I've verified the tag with Joey's GPG keys. + +Documenting here: + +Get Joey's [GPG keys](https://joeyh.name/contact/) + +``` +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 +``` + +"""]] -- cgit v1.2.3