search

p-m / org-notify

Notifications for Org-mode
16 stars 8 forks source link

org-notify has diverged #9

Closed monnier closed 2 years ago

monnier commented 2 years ago

Hi, GNU ELPA can't track the upstream code any more because it has diverged. This is probably the result of a force-push on your upstream repository or something like that:

% make fetch/org-notify              
emacs --batch -l admin/elpa-admin.el -f elpaa-batch-fetch-and-show "org-notify"
Fetching updates for org-notify...
Upstream of org-notify has DIVERGED!

  Local changes:
bbd9a049ff  pm@a16n.net       No more need to prefix actions with a hyphen

  Upstream changes:
dbb2347fb4  pm@a16n.net       Make use of the function ensure-list in org-notify-process

%

In order for GNU ELPA to track your changes, it has to be able to "fast-forward", so you need to merge the bbd9a049ff commit into your upstream tree, e.g.:

cd .../where/you/keep/your/clone/of/org-notify
git fetch git://git.sv.gnu.org/emacs/elpa.git externals/org-notify
git merge FETCH_HEAD
p-m commented 2 years ago

Sorry. I thought, that you update ELPA only when the version number changes...

Ok, done.

monnier commented 2 years ago

Sorry. I thought, that you update ELPA only when the version number changes...

GNU ELPA only receives new tarballs when the Version: number changes, but GNU-devel ELPA gets new tarballs whenever new commits are pushed, like MELPA (IOW, a bit like MELPA -vs- MELPA-Stable except the default is the stable one).

See https://elpa.gnu.org/devel/org-notify.html

    Stefan