Hi,
After upgrading from propellor 5.1.0 to 5.2.0 I do get
** warning: ** Your ~/.propellor/ is out of date..
The ~/.propellor
directory was created with
propellor --init
Is there a
propellor --update-my-home-propellor
??
Hi,
After upgrading from propellor 5.1.0 to 5.2.0 I do get
** warning: ** Your ~/.propellor/ is out of date..
The ~/.propellor
directory was created with
propellor --init
Is there a
propellor --update-my-home-propellor
??
You'd update it by git merge with propellor upstream, since your ~/.propellor in this case is forked from propellor's git repository, rather than the other option of being a separate git repository that uses propellor as a library.
I think there should be more to the message than what you showed, explaining what you'd to do merge.
If you update by merging from Joey's repo but have the Debian propellor package installed you'll always get this because the bundle in
/usr/src/propellor
has a commit ID that is distinct from any of those in Joey's branch.I think it would be nice to have a git config option to disable the check for those of us in the situation I just described.
The warning is printed twice.
One at the very beginning:
The other at the end of executing:
It was the last one that made me report this. The one that is color highlighted, the one that doesn't have the
git merge
advice.Ah I see, it was mixing concurrent output with unbuffered output, which in this case caused the related messages to appear separated. Fixed that.
@spwhitton ah, I had not noticed that case. I found a way to avoid the unncessary warning in that case; since there's no upstream/master ref when ~/.propellor has not been cloned from the debian git bundle, it can detect that and avoid warning. Done so.
git remote rename upstream joey
@spwhitton, ah but in that case you have a remote named "upstream", so it can assume you don't want it messing with upstream/master. Done!
Hello, I think that my problem is related to this one.
I have a repository created from the Debian package and which is from the 5.1.0 version. I just upgrade the package to 5.3.1 and now I do not have the message explaining that a new upstream version is available. So I do not know how to upgrade my current repository.
Before, I just had to do
And now ?
thanks for your help
Yes sir
What propellor --init sets up, when you select the clone option and the Debian package is installed, is no remote defined, but a remotes/upsteam/master tracking branch.
So not normally this:
Aha! The very first revision of propellor --init did set up an upstream remote pointing at the distrepo. At some point that changed to the above described behavior. You're bitten by being an early adopter.
I've adjusted the logic to handle that case.
Thanks a lot joey,
and you are right, I am fund of your works :).
Cheers.
Hello, sorry to bother you with this BUT
Now I have the right message which explain how to upgrade my .propellor (sorry for the french)
but when I try to do the merge, I get this error message
How can I help to solve this issue ?
Hello,
--allow-unrelated-history is your friend