Port projectile-time-seconds to future Emacs #1735
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Don’t assume internal format of Emacs timestamps. They are documented to change in a future version. This patch works on older Emacs versions; it can be simplified to just use time-convert if we assume Emacs 27 or later.
|
Stefan writes that you need to merge this PR rather than rebasing it, so that projectile propagates to Savannah properly. Sorry, when I changed the copy on Savannah I didn't realize the workflow meant you needed to merge the change upstream. |
|
No worries. Thanks! |
|
Looks like the commit merged wasn't quite the right one: Could you Sorry 'bout the hassle. |
|
Hey there,
What should I set as the remote in this case? I guess Projectile is some submodule in NonGNU ELPA, but I never had much dealings with modules.
Sorry 'bout the hassle.
No problem, I'm just a bit confused about what happened.
On Tue, Dec 21, 2021, at 4:05 AM, monnier wrote:
Looks like the commit merged wasn't quite the right one:
`% make fetch/projectile
emacs --batch -l admin/elpa-admin.el -f elpaa-batch-fetch-and-show "projectile"
Fetching updates for projectile...
Upstream of projectile has DIVERGED!
Local changes:
Depuis https://github.com/bbatsov/projectile
* [nouvelle référence] -> upstream/projectile/main
ac60885 ***@***.*** Port projectile-time-seconds to future Emacs
Upstream changes:
fab2c54 ***@***.*** Tweak a changelog entry
b7937e2 ***@***.*** [#1734] Add a changelog entry
f7eba5e ***@***.*** Fix emacs 25 incompat in projectile--complementary-file
f753cdb ***@***.*** Update documentation around test/src-dir and update sbt project type
139cb02 ***@***.*** Fix tests
fad389a ***@***.*** Make src/test-dir as strings take priority over fallback
cd8bcbc ***@***.*** Merge pull request #1735 from eggert/timestamp
43decc5 ***@***.*** Port projectile-time-seconds to future Emacs
%
`
…
Could you `git merge -s ours ac60885` so `nongnu.git`'s branch can be fast-forwarded to the upstream?
Currently, NonGNU ELPA is not sync'ing with the Github repository because it requires a merge rather than a fast-forward :-(
Sorry 'bout the hassle.
—
Reply to this email directly, view it on GitHub <#1735 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAAZLSTNQAVDOMDHUOSDRVDUR7OIHANCNFSM5KESPKUA>.
You are receiving this because you modified the open/close state.Message ID: ***@***.***>
|
|
Hmm I see there was a copy&paste typo: |
|
Done. Let me know if we managed to fix the problem. |
|
Done. Let me know if we managed to fix the problem.
Thanks, it's working again!
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Don’t assume internal format of Emacs timestamps.
They are documented to change in a future version.
This patch works on older Emacs versions; it can be simplified
to just use time-convert if we assume Emacs 27 or later.