Bug#834895: fatal: refusing to merge unrelated histories

2016-08-21 Thread Sean Whitton
Hello, On Sun, Aug 21, 2016 at 06:17:59AM +, PICCA Frederic-Emmanuel wrote: > > So you're installing the .deb from stretch on your jessie machine? > > > Yes exactly I rebuild the propellor on my jessie machines. Sounds like it would be useful for me to upload a backport? -- Sean Whitton

Bug#834895: fatal: refusing to merge unrelated histories

2016-08-20 Thread PICCA Frederic-Emmanuel
> So you're installing the .deb from stretch on your jessie machine? Yes exactly I rebuild the propellor on my jessie machines. > I suggest that you install the /usr/bin/propellor wrapper from the > jessie repos, and then use a more recent ~/.propellor. E.g.: >cd ~/.propellor >git remo

Bug#834895: fatal: refusing to merge unrelated histories

2016-08-20 Thread Sean Whitton
Hello, On Sat, Aug 20, 2016 at 05:30:51PM +, PICCA Frederic-Emmanuel wrote: > Yes, but usually, I prepare my configuration on the targetted machine. (a > jessie machine) > So if I can not run propello on jessie I will be really sad ;) So you're installing the .deb from stretch on your jessie

Bug#834895: fatal: refusing to merge unrelated histories

2016-08-20 Thread PICCA Frederic-Emmanuel
> It means you need git 2.9 on the system you run `propellor --spin`, but > it shouldn't break anything on the host you are trying to configure. Yes, but usually, I prepare my configuration on the targetted machine. (a jessie machine) So if I can not run propello on jessie I will be really sad ;

Bug#834895: fatal: refusing to merge unrelated histories

2016-08-20 Thread Sean Whitton
Hello, On Sat, Aug 20, 2016 at 03:32:30PM +, PICCA Frederic-Emmanuel wrote: > don't you think that it will break propellor for all version << 1:2.9 It means you need git 2.9 on the system you run `propellor --spin`, but it shouldn't break anything on the host you are trying to configure. --

Bug#834895: fatal: refusing to merge unrelated histories

2016-08-20 Thread PICCA Frederic-Emmanuel
Hello Sean diff --git a/debian/control b/debian/control index 9194b6c..21a524d 100644 --- a/debian/control +++ b/debian/control @@ -43,7 +43,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, libghc-stm-dev, libghc-text-dev, libghc-concurrent-output-dev, - git, +

Bug#834895: fatal: refusing to merge unrelated histories

2016-08-20 Thread Sean Whitton
control: tag -1 + upstream patch pending Hello Fred, Thanks for reporting this. On Sat, Aug 20, 2016 at 02:40:03PM +0200, picca wrote: > When I try to use propellor, I get this error message now... > > picca@mordor:~/.propellor$ LANG=C PROPELLOR_DEBUG=1 propellor > fatal: refusing to merge unrel

Bug#834895: fatal: refusing to merge unrelated histories

2016-08-20 Thread picca
Package: propellor Version: 3.1.0-1+b2 Severity: important Dear Maintainer, When I try to use propellor, I get this error message now... picca@mordor:~/.propellor$ LANG=C PROPELLOR_DEBUG=1 propellor fatal: refusing to merge unrelated histories propellor: Failed to run git ["merge","82be944938cf