-
-
Notifications
You must be signed in to change notification settings - Fork 480
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
provide proper cygwin rebasing scripts #14031
Comments
Attachment: trac_14031.patch.gz |
comment:1
Is this the right way to provide patches for |
This comment has been minimized.
This comment has been minimized.
comment:2
I don't know what you mean by "right way". I usually go into
But the script isn't called An additional remark in the script about just using |
comment:3
Replying to @kcrisman:
I was wondering whether I need to wrap it up in an spkg...
the batch file does the right thing, if your Cygwin is in
no, it is meant to be changed in the batch file body. Perhaps I should mention that it is meant to call the dash script from the batch file, and not directly. By the way, setting
And if you need to evaluate
will print |
comment:4
No, one can just do the usual hg thing.
I did figure that out eventually by staring at it :)
Good.
Sure. I would have just called it directly somehow.
Useful info, though! |
comment:5
We should also/instead provide a bash script using rebase -O as Dima suggested on #6743. |
comment:6
Please add your real name as Author. |
Author: Dmitrii Pasechnik |
comment:8
+1 - this worked very nicely for me recently. I don't see why one couldn't replace the current one with that. |
comment:9
It would also be nice to mention the /etc/rebase.db.i386 file, its use and the potential need to clean it up (or at least it seems that at some point deleting it was useful for some of us, Dima could you confirm that?). |
comment:10
There is also a tiny typo.
It doesn't affect things because it's in a comment, but could affect users. |
Attachment: trac_14031-scripts.patch.gz Updated scripts, using rebaseall or rebase -O. |
Changed author from Dmitrii Pasechnik to Dmitrii Pasechnik, Jean-Pierre Flori |
This comment has been minimized.
This comment has been minimized.
Dependencies: #14465 |
This comment has been minimized.
This comment has been minimized.
Changed dependencies from #14465 to none |
comment:14
Fair enough. By the way, I give positive review to the actual commands, as does no doubt J-P. But I haven't (and won't have) had the chance to try out the actual scripts "in production" as my Cygwin is not available currently, and someone should try them in such a situation just to make sure we didn't miss a typo or something, or that the extreme minimality of the shells in Windows doesn't cause one of them to hiccup ( |
Reviewer: Jean-Pierre Flori, Karl-Dieter Crisman |
comment:15
Replying to @kcrisman:
Great! We can still fix bugs later. |
Merged: sage-5.9.rc1 |
comment:17
I had a situation when I needed to rebase before sage_scripts spkg was installed (while building python spkg), so sage-rebase was not installed. This is a kind of bug I don't know how to address properly (although installing the spkg with ./sage -f did help). |
comment:18
Replying to @dimpase:
Move the scripts to |
Rebasing half-built, or fully built, Sage Cygwin installation currently
needs manual labour. This patch provides shell scripts and MSDOS batch files to make this more automatic, using 'rebaseall' or 'rebase -O'. One will only needs to adjust
SAGE_ROOT
in the batch file once (per Sage install).The documentation (outside of within the script themselves) will be provided at #14465.
Apply to
sage_scripts
:CC: @kcrisman @jpflori
Component: porting: Cygwin
Keywords: rebaseall, rebase
Author: Dmitrii Pasechnik, Jean-Pierre Flori
Reviewer: Jean-Pierre Flori, Karl-Dieter Crisman
Merged: sage-5.9.rc1
Issue created by migration from https://trac.sagemath.org/ticket/14031
The text was updated successfully, but these errors were encountered: