search

openmathdocs / mathbook

OpenMathDoc's version of MathBook XML
Other
0 stars 0 forks source link

quant/quantity #11

Open Alex-Jordan opened 9 years ago

Alex-Jordan commented 9 years ago

I think I have a mess to clean up, which I will soon.

I believe I finished the quantity element. I tried to streamline things for Rob, and so I rebased and squashed commits. I knew that he had already made a local copy of my feature branch, and that meant that if he pulled my rebased version he'd have a ton of conflicts. So I renamed the branch locally (from feature/quant to feature/quantity), pushed it here, made a new pull request to him, and closed the first one.

I only just realized that feature/quant had already been merged here. So what I'm going to do is wait until Rob accepts feature/quantity, which I hope will be soon. Then I'll take care of whatever needs to be done to get rid of feature/quant in our omd/dev, so that I can merge feature/quantity into it. Hope it doesn't interfere with anything you are working on, but I can't see how it would, unless you are working on something that just by coincidence happens to be adjacent to where I put the quantity stuff.

cmhughes commented 9 years ago

No worries; I was thinking that we should rebase omd/dev, so maybe this would be a good opportunity to do so?

On Friday, March 6, 2015, Alex Jordan notifications@github.com wrote:

I think I have a mess to clean up, which I will soon.

I believe I finished the quantity element. I tried to streamline things for Rob, and so I rebased and squashed commits. I knew that he had already made a local copy of my feature branch, and that meant that if he pulled my rebased version he'd have a ton of conflicts. So I renamed the branch locally (from feature/quant to feature/quantity), pushed it here, made a new pull request to him, and closed the first one.

I only just realized that feature/quant had already been merged here. So what I'm going to do is wait until Rob accepts feature/quantity, which I hope will be soon. Then I'll take care of whatever needs to be done to get rid of feature/quant in our omd/dev, so that I can merge feature/quantity into it. Hope it doesn't interfere with anything you are working on, but I can't see how it would, unless you are working on something that just by coincidence happens to be adjacent to where I put the quantity stuff.

— Reply to this email directly or view it on GitHub https://github.com/openmathdocs/mathbook/issues/11.

cmhughes commented 9 years ago

You might need to use git push --force; there's not much that is new in omd/dev so it could probably be deleted and copied from origin/dev.

Alex-Jordan commented 9 years ago

I would like to get us both (plus Github) on the same place regarding the branch omd/dev, which we locally call omddev.

So now, with everything fetched so my local copies of remotes are up to date, from the omddev branch, I get this:

SYST104M4138mc:mathbook alexjordan$ git status
On branch omddev
Your branch is ahead of 'omd/dev' by 34 commits.
  (use "git push" to publish your local commits)

nothing to commit, working directory clean

It would appear that I could now safely push to omd/dev. However, if I try to, 

SYST104M4138mc:mathbook alexjordan$ git push omd dev
To https://github.com/openmathdocs/mathbook
 ! [rejected]        dev -> dev (non-fast-forward)
error: failed to push some refs to 'https://github.com/openmathdocs/mathbook'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

It still thinks, despite my rebase, that my local omddev is not a fast-forward of omd/dev. Should I force push? The downside would be that you may have conflicts if I do that, when you pull omd/dev into your omddev. You could also force pull though.

cmhughes commented 9 years ago

I believe that a rebase re-writes history, so a forced push might always(?) be necessary...? Given that quant is still ongoing to origin/dev, it might be best to unpick it from omd/dev.

So far we've merged the optional typeout, an optional latex label, an update to README, and an older version of quant. Other than that, I don't think omd/dev is all that different. Feel free to force push up to it, or to delete it and start again from origin/dev, whatever you think is best.

On Sun, Mar 8, 2015 at 8:57 PM, Alex Jordan notifications@github.com wrote:

I would like to get us both (plus Github) on the same place regarding the branch omd/dev, which we locally call omddev.

  • First I fetched both origin and omd remote repos.
  • Then I checked out omddev.
  • Then I pulled omd/dev into omddev.
  • Then I pulled origin/dev into omddev.
  • Then I merged my local feature/quantity into omddev.
  • At each of the three above steps, there were conflicts to resolve, which I did.
  • Understandably at this point, my local omddev and github/.../omd/dev were divergent, so I rebased omddev off of omd/dev. This should rewind omddev, apply commits to get it up to date with omd/dev, and then reapply the omddev commits. There were merge conflicts along the way, which were easy to deal with.

So now, with everything fetched so my local copies of remotes are up to date, from the omddev branch, I get this:

SYST104M4138mc:mathbook alexjordan$ git status On branch omddev Your branch is ahead of 'omd/dev' by 34 commits. (use "git push" to publish your local commits)

nothing to commit, working directory clean

It would appear that I could now safely push to omd/dev. However, if I try to,

SYST104M4138mc:mathbook alexjordan$ git push omd dev To https://github.com/openmathdocs/mathbook ! [rejected] dev -> dev (non-fast-forward) error: failed to push some refs to 'https://github.com/openmathdocs/mathbook' hint: Updates were rejected because a pushed branch tip is behind its remote hint: counterpart. Check out this branch and integrate the remote changes hint: (e.g. 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.

It still thinks, despite my rebase, that my local omddev is not a fast-forward of omd/dev. Should I force push? The downside would be that you may have conflicts if I do that, when you pull omd/dev into your omddev. You could also force pull though.

— Reply to this email directly or view it on GitHub https://github.com/openmathdocs/mathbook/issues/11#issuecomment-77773757 .

Alex-Jordan commented 9 years ago

OK, I force pushed my local omddev (which should be completely up to date) to omd/dev on github. See if you can fetch it, then pull it. You may have to resolve conflicts, or you may want to just force pull it.

Things that are still "out there" being worked on, and not yet pulled into omd/dev:

Once we are both "on the same page" as far as omddev goes, I'll set up a new branch of precalc as mentioned earlier. And we can agree to be using xsl from omddev.

cmhughes commented 9 years ago

I deleted my local omddev branch, and re-created a new one to track omd/dev. Not sure what happens next....

On Mon, Mar 9, 2015 at 2:25 AM, Alex Jordan notifications@github.com wrote:

OK, I force pushed my local omddev (which should be completely up to date) to omd/dev on github. See if you can fetch it, then pull it. You may have to resolve conflicts, or you may want to just force pull it.

Things that are still "out there" being worked on, and not yet pulled into omd/dev:

  • sidebyside (you)
  • tables (you and Rob)
  • any final tweaks Rob wants from feature/quantity, once he has time to review it (me)
  • cols attribute for exercisegroup (me)

Once we are both "on the same page" as far as omddev goes, I'll set up a new branch of precalc as mentioned earlier. And we can agree to be using xsl from onddev.

— Reply to this email directly or view it on GitHub https://github.com/openmathdocs/mathbook/issues/11#issuecomment-77791143 .

Alex-Jordan commented 9 years ago

OK, have you fetched and pulled your new branch? Here's what I have:

SYST104M4138mc:mathbook alexjordan$ git status
On branch omddev
Your branch is up-to-date with 'omd/dev'.

nothing to commit, working directory clean

SYST104M4138mc:mathbook alexjordan$ git log
commit d33029cfa033b818b39bb800c29f0e4aa9ed5232
...

Do you have the same most recent commit?

If so, see my other message about precalc in our email thread. I'm going to see if I can straighten out some more on that front. But at a minimum at this point, if you follow the instructions in precalc/src/readme.txt (in the MBX-only branch) then you will see the beginnings of the HTML output. And you will also see the beginnings of tex output, but there is work to do yet to get it to compile. My recent thread on the MBX support group relates to that.

cmhughes commented 9 years ago

OK, have you fetched and pulled your new branch?

Yep.

Here's what I have:

SYST104M4138mc:mathbook alexjordan$ git status On branch omddev Your branch is up-to-date with 'omd/dev'.

nothing to commit, working directory clean

SYST104M4138mc:mathbook alexjordan$ git log commit d33029cfa033b818b39bb800c29f0e4aa9ed5232 ...

Do you have the same most recent commit?

Yes, this is what I have.

I'm a little confused with all the changes at the moment, but feel free to keep ploughing forward. I've seen your posts on the MBX support forum; I tend not to get involved with those discussions because my voice doesn't usually tend to carry much weight, and I don't have a good way to make my points.

I think that MBX is a good way to generate chapter content, but (at least for the moment) I don't think the preamble is good enough for omd.

If so, see my other message about precalc in our email thread. I'm going to see if I can straighten out some more on that front. But at a minimum at this point, if you follow the instructions in precalc/src/readme.txt (in the MBX-only branch) then you will see the beginnings of the HTML output. And you will also see the beginnings of tex output, but there is work to do yet to get it to compile. My recent thread on the MBX support group relates to that.

— Reply to this email directly or view it on GitHub https://github.com/openmathdocs/mathbook/issues/11#issuecomment-78394939 .