You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
The reason will be displayed to describe this comment to others. Learn more.
@ellisonbg can you explain this commit? It's causing problems for launchpad, since they can't handle submodules. However, this location is not part of IPython either before or after this commit, so it appears to have had exactly no effect other than breaking something in launchpad. Were you using submodules locally that were not actually part of trunk?
The reason will be displayed to describe this comment to others. Learn more.
See the lp import page for the relevant error messages. We are going to have to rebase IPython to remove this commit (which probably never should have happened) if we want IPython to be importable in bzr for at least the next few months before submodule support is added, even though we never actually had any submodules. As I understand it, this would be necessary for @juliantaylor's nightly ppa.
The reason will be displayed to describe this comment to others. Learn more.
'Subproject commit' means it's a submodule. The parent introduced it, and this fix should have been applied with a 'fixup', rather than allowing the original commit to stand.
The reason will be displayed to describe this comment to others. Learn more.
I was out for the day. I have no idea how this got in there. I was
definitely not (as far as I know...) using a submodule. Any ideas on
the best way to "fix" this?
On Mon, Jan 16, 2012 at 8:59 PM, Min RK ***@***.*** wrote:
'Subproject commit' means it's a submodule. The parent introduced it, and this fix should have been applied with a 'fixup', rather than allowing the original commit to stand.
---
Reply to this email directly or view it on GitHub:
e075f09#commitcomment-873062
##
Brian E. Granger
Cal Poly State University, San Luis Obispo
bgranger@calpoly.edu and ellisonbg@gmail.com
The reason will be displayed to describe this comment to others. Learn more.
it appears to be introduced and fixed in subsequent commits, so a simple rebase, squashing the two commits together should do it. This may wreak some small havoc on outstanding PRs, but I'm not sure.
The reason will be displayed to describe this comment to others. Learn more.
Yes, go ahead and do this. Do you think we will need to do anything
to existing branches/PRs?
On Tue, Jan 17, 2012 at 3:55 PM, Min RK ***@***.*** wrote:
Should I do the rebase and force push? It's trivial to do, and I've pushed the result [to my newmaster branch](https://github.com/minrk/ipython/tree/newmaster), which shows an empty diff with master.
---
Reply to this email directly or view it on GitHub:
e075f09#commitcomment-876415
##
Brian E. Granger
Cal Poly State University, San Luis Obispo
bgranger@calpoly.edu and ellisonbg@gmail.com
The reason will be displayed to describe this comment to others. Learn more.
Ones created since the last bad commit ('absolute imports' and after) will probably need a rebase, but I can't be sure. I'll go ahead, and notify the list.
e075f09There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ellisonbg can you explain this commit? It's causing problems for launchpad, since they can't handle submodules. However, this location is not part of IPython either before or after this commit, so it appears to have had exactly no effect other than breaking something in launchpad. Were you using submodules locally that were not actually part of trunk?
e075f09There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See the lp import page for the relevant error messages. We are going to have to rebase IPython to remove this commit (which probably never should have happened) if we want IPython to be importable in bzr for at least the next few months before submodule support is added, even though we never actually had any submodules. As I understand it, this would be necessary for @juliantaylor's nightly ppa.
/cc @fperez
e075f09There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nasty, I wonder what's wrong with that commit: if I check out the parent 813d390, the subdirectory with codemirror2/ looks perfectly normal.
I don't understand why the commit shows up with that strange message
-Subproject commit 3b731bb8c16efc8cb82b9f28a9ed91428d71a703...In any case, if we need to do a rebase, the sooner the better... But we should announce it on-list so everyone knows what's going on.
e075f09There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
'Subproject commit' means it's a submodule. The parent introduced it, and this fix should have been applied with a 'fixup', rather than allowing the original commit to stand.
e075f09There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
e075f09There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
e075f09There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should I do the rebase and force push? It's trivial to do, and I've pushed the result to my newmaster branch, which shows an empty diff with master.
e075f09There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
e075f09There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ones created since the last bad commit ('absolute imports' and after) will probably need a rebase, but I can't be sure. I'll go ahead, and notify the list.
e075f09There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.