Bug#872523: RE:RE:Bug#872523: fatal: refusing to merge unrelated histories
Hello Fred, On Sat, Aug 19 2017, PICCA Frederic-Emmanuel wrote: > I did a > > git merge -Xtheirs upstream/master --allow-unrelated-hitories > > this wipeout my config-simple.hs. This is a workaround, yes. > So I ammended the merge in order to restore config.hs and fix it with > the new propellor. I hope that next timeit will work without all this > mess ;) propellor is meant to generate upstream/master in such a way that it can always be merged without --allow-unrelated-histories. Since you couldn't merge it, something went wrong with that. I'd like to track down the problem by examining your full DEBUG output. If you would like to help, please create a new branch starting at a commit before you did the workaround, such that the problem reoccurs, and then provide me with the full debug output upon spinning that branch. If you don't want to do this, please close the bug. -- Sean Whitton signature.asc Description: PGP signature
Bug#872523: RE:RE:Bug#872523: fatal: refusing to merge unrelated histories
I did a git merge -Xtheirs upstream/master --allow-unrelated-hitories this wipeout my config-simple.hs. So I ammended the merge in order to restore config.hs and fix it with the new propellor. I hope that next timeit will work without all this mess ;) Cheers Fred
Bug#872523: RE:RE:Bug#872523: fatal: refusing to merge unrelated histories
> Okay. I think that this is a bug, but I don't know how to reproduce it > yet. > Do you have an upstream remote pointing to Joey's repository? [remote "upstream"] url = /usr/src/propellor/propellor.git fetch = +refs/heads/*:refs/remotes/upstream/* > Please run propellor with PROPELLOR_DEBUG=1 so we can see the commands > it runs to set up the upstream/master branch. picca@mordor:~$ PROPELLOR_DEBUG=1 propellor ** warning: ** Your ~/.propellor/ is out of date.. A newer upstream version is available in /usr/src/propellor/propellor.git To merge it, run: git merge upstream/master [2017-08-19 08:39:07 CEST] read: hostname ["-f"] [2017-08-19 08:39:07 CEST] process done ExitSuccess [2017-08-19 08:39:07 CEST] command line: Run "mordor" [2017-08-19 08:39:07 CEST] read: git ["remote"] [2017-08-19 08:39:07 CEST] process done ExitSuccess [2017-08-19 08:39:07 CEST] read: git ["symbolic-ref","--short","HEAD"] [2017-08-19 08:39:07 CEST] process done ExitSuccess [2017-08-19 08:39:07 CEST] call: git ["fetch"] Enter passphrase for key '/home/picca/.ssh/id_rsa': In fact this where I do not understand. When I do the merge, I use to do only plain git commant as explained by propellor git merge upstream/master -- Sean Whitton
