propellor

propellor config for hosts.
git clone git://git.ricketyspace.net/propellor.git
Log | Files | Refs | LICENSE

comment_4_26738f91fe511b49552a68e70f201059._comment (1367B)


      1 [[!comment format=mdwn
      2  username="s@aa9ff9ce06b08acfd2a93ebd342ce6879430fbdd"
      3  nickname="s"
      4  avatar="http://cdn.libravatar.org/avatar/81bf27f8b35011d1846711fa37a5588f"
      5  subject="comment 4"
      6  date="2019-06-04T00:38:58Z"
      7  content="""
      8 [@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:
      9 
     10 ```
     11 cygnus$ git remote -v           
     12 s       g@git.rs:~/c/propellor.git (fetch)
     13 s       g@git.rs:~/c/propellor.git (push)
     14 u       git://propellor.branchable.com/propellor (fetch)
     15 u       git://propellor.branchable.com/propellor (push)
     16 
     17 
     18 cygnus$ git tag -l | grep 5.8.0
     19 5.8.0
     20 
     21 cygnus$ git merge 5.8.0
     22 fatal: refusing to merge unrelated histories
     23 cygnus$ git merge u/master
     24 fatal: refusing to merge unrelated histories
     25 ```
     26 
     27 First commit in upstream repo:
     28 
     29 ```
     30 cygnus$ git log --reverse u/master | head -n 5
     31 commit d9af8bac5eb7836a3c90e37e870fd73d30b841fd
     32 Author: Joey Hess <joey@kitenet.net>
     33 Date:   Sat Mar 29 23:10:52 2014 -0400
     34 
     35     initial check-in
     36 ```
     37 
     38 First commit in my repo:
     39 
     40 ```
     41 cygnus$ git log --reverse s/master | head -n 5 
     42 commit ff6173d6cd45e383da0f315bc80b52d486306cbc
     43 Author: build <build@buildhost>
     44 Date:   Tue Nov 22 14:16:29 2016 -0700
     45 
     46     distributed version of propellor
     47 
     48 ```
     49 """]]