Menu
▾
▴
cpp-netlib-devel
|
From: Jeroen H. <vex...@gm...> - 2009-12-22 19:13:19
|
Hi, Firstly, thank you Dean for merging my current fork. This however has gotten me confused with github, can I still use my current fork to continue development (which I suspect will be broken more often, as bigger changes are coming), or is it easier to create a new fork. If a new fork is easier, what branch should I fork ? Jeroen Habraken |
|
From: Dean M. B. <mik...@gm...> - 2009-12-26 04:56:42
|
Hi Jeroen! I apologize for taking a while to respond. I've been away from my computer for the better part of this Christmas break and I've only gotten back to my mail now. Please see my response below. On Wed, Dec 23, 2009 at 3:12 AM, Jeroen Habraken <vex...@gm...> wrote: > Hi, > > Firstly, thank you Dean for merging my current fork. You're welcome! Thanks for the contributions also. :) > This however has > gotten me confused with github, can I still use my current fork to > continue development (which I suspect will be broken more often, as > bigger changes are coming), or is it easier to create a new fork. If a > new fork is easier, what branch should I fork ? > Yes, you can continue to use your fork to continue development. What I suggest you do is learn how to track a remote branch using git, and then continue development on 0.5-devel -- or if you prefer, create a branch on your github fork then do your development from there. Because you're doing development against the master branch, I'll integrate your work to my master branch only when you feel it's safe to integrate to master on your end. So the steps would be: 1. Create a branch on your fork for your development 2. Continue development on your branch 3. Once you're ready to integrate more work in, make sure your master branch is sync'ed with my master branch 4. Merge your work from your branch to your master branch 5. Send me a pull request message and I will integrate to my fork-integration branch, then integrate to master I hope this makes sense. Have a great week ahead and I hope you're having a great and restful holiday season! -- Dean Michael Berris blog.cplusplus-soup.com | twitter.com/mikhailberis linkedin.com/in/mikhailberis | facebook.com/dean.berris | deanberris.com |
|
From: Jeroen H. <vex...@gm...> - 2010-01-10 13:51:55
|
Hi Dean, On Sat, Dec 26, 2009 at 05:56, Dean Michael Berris <mik...@gm...> wrote: > Hi Jeroen! > > I apologize for taking a while to respond. I've been away from my > computer for the better part of this Christmas break and I've only > gotten back to my mail now. Please see my response below. > > On Wed, Dec 23, 2009 at 3:12 AM, Jeroen Habraken <vex...@gm...> wrote: >> Hi, >> >> Firstly, thank you Dean for merging my current fork. > > You're welcome! Thanks for the contributions also. :) > >> This however has >> gotten me confused with github, can I still use my current fork to >> continue development (which I suspect will be broken more often, as >> bigger changes are coming), or is it easier to create a new fork. If a >> new fork is easier, what branch should I fork ? >> > > Yes, you can continue to use your fork to continue development. What I > suggest you do is learn how to track a remote branch using git, and > then continue development on 0.5-devel -- or if you prefer, create a > branch on your github fork then do your development from there. > Because you're doing development against the master branch, I'll > integrate your work to my master branch only when you feel it's safe > to integrate to master on your end. > > So the steps would be: > > 1. Create a branch on your fork for your development > 2. Continue development on your branch > 3. Once you're ready to integrate more work in, make sure your master > branch is sync'ed with my master branch > 4. Merge your work from your branch to your master branch > 5. Send me a pull request message and I will integrate to my > fork-integration branch, then integrate to master > > I hope this makes sense. > > Have a great week ahead and I hope you're having a great and restful > holiday season! > > -- > Dean Michael Berris > blog.cplusplus-soup.com | twitter.com/mikhailberis > linkedin.com/in/mikhailberis | facebook.com/dean.berris | deanberris.com > Just found the Fork Queue and I think I've got the basics of github figured. I found a bug in the current code on github where I was using the Spirit > operator instead of >>, which could lead to exceptions being thrown, and made a pull request for that. Next I'll try to merge my code with the new parser to the 0.5-devel branch of my fork as I'm already working in a 0.5-devel checkout Yours, Jeroen |
|
From: Dean M. B. <mik...@gm...> - 2010-01-10 15:33:01
|
On Sun, Jan 10, 2010 at 9:43 PM, Jeroen Habraken <vex...@gm...> wrote: > > Just found the Fork Queue and I think I've got the basics of github > figured. I found a bug in the current code on github where I was using > the Spirit > operator instead of >>, which could lead to exceptions > being thrown, and made a pull request for that. Next I'll try to merge > my code with the new parser to the 0.5-devel branch of my fork as I'm > already working in a 0.5-devel checkout > Cool. I've merged it, but then now the problem is it breaks. Have you rebased your branch to get the changes I merged into master? Because now the implementation fails with wide strings in GCC Linux. Let me try to debug locally and push a change to fix it. Please rebase your branches from master's HEAD if you intend to continue working on the implementation. :) Thanks again and I hope this helps! -- Dean Michael Berris cplusplus-soup.com | twitter.com/deanberris linkedin.com/in/mikhailberis | facebook.com/dean.berris | deanberris.com |
|
From: Jeroen H. <vex...@gm...> - 2010-01-10 16:32:32
|
Hi Dean, On Sun, Jan 10, 2010 at 16:32, Dean Michael Berris <mik...@gm...> wrote: > On Sun, Jan 10, 2010 at 9:43 PM, Jeroen Habraken <vex...@gm...> wrote: >> >> Just found the Fork Queue and I think I've got the basics of github >> figured. I found a bug in the current code on github where I was using >> the Spirit > operator instead of >>, which could lead to exceptions >> being thrown, and made a pull request for that. Next I'll try to merge >> my code with the new parser to the 0.5-devel branch of my fork as I'm >> already working in a 0.5-devel checkout >> > > Cool. > > I've merged it, but then now the problem is it breaks. > > Have you rebased your branch to get the changes I merged into master? > > Because now the implementation fails with wide strings in GCC Linux. > > Let me try to debug locally and push a change to fix it. Please rebase > your branches from master's HEAD if you intend to continue working on > the implementation. :) > > Thanks again and I hope this helps! > > -- > Dean Michael Berris > cplusplus-soup.com | twitter.com/deanberris > linkedin.com/in/mikhailberis | facebook.com/dean.berris | deanberris.com > > ------------------------------------------------------------------------------ > This SF.Net email is sponsored by the Verizon Developer Community > Take advantage of Verizon's best-in-class app development support > A streamlined, 14 day to market process makes app distribution fast and easy > Join now and get one step closer to millions of Verizon customers > http://p.sf.net/sfu/verizon-dev2dev > _______________________________________________ > Cpp-netlib-devel mailing list > Cpp...@li... > https://lists.sourceforge.net/lists/listinfo/cpp-netlib-devel > I've applied a bunch of things from the Fork Queue, and ignored a few that failed, which might explain the problem (and would this lead to problems in the future, if so, how do I go about fixing it). Jeroen |
|
From: Dean M. B. <mik...@gm...> - 2010-01-10 16:42:05
|
On Mon, Jan 11, 2010 at 12:32 AM, Jeroen Habraken <vex...@gm...> wrote: > > I've applied a bunch of things from the Fork Queue, and ignored a few > that failed, which might explain the problem (and would this lead to > problems in the future, if so, how do I go about fixing it). > One way you can do it is by doing a manual rebase of your fork from your local repository. You will want to look at git-rebase and git-pull manuals to get that done. What you want to do first is in your master branch, you get the changes from the 'upstream' branch. Quoting from Github's documentation on Forking ( http://help.github.com/forking/): Pulling in upstream changes > > Some time has passed, the upstream repo has changed and you want to update > your fork before you submit a new patch. There are two ways to do this: > > > $ git fetch upstream master > > $ git merge upstream/master > > > $ git pull upstream master > > git pull is a more direct way, but the merge it performs can be confusing > if the user doesn’t expect it and a merge conflict results. git fetch will > also grab all branches, where git pull will only grab the one specified. > > If you have local commits that are not in the upstream branch, a normal > merge will occur. If your local commits are in the upstream branch, a > fast-forward merge will be done, moving your local branch to the same commit > as upstream/master. If both repos have edits to the same location in the > same file, you may run into a merge conflict. Conflicts must be resolved by > hand and a commit made to complete the merge. > > Now that your local branch has been updated, you can commit, push, and send > a pull request. > > You may wish to do the fetch and merge manually, instead of letting > git-pull do it for you. This can sometimes help avoid headaches caused by > mysterious merge conflicts. > (Sorry for the HTML email, I just found it might work better for quoting). HTH -- Dean Michael Berris cplusplus-soup.com | twitter.com/deanberris linkedin.com/in/mikhailberis | facebook.com/dean.berris | deanberris.com |
|
From: Jeroen H. <vex...@gm...> - 2010-01-10 18:16:35
|
Hi Dean, On Sun, Jan 10, 2010 at 17:41, Dean Michael Berris <mik...@gm...> wrote: > On Mon, Jan 11, 2010 at 12:32 AM, Jeroen Habraken <vex...@gm...> > wrote: >> >> I've applied a bunch of things from the Fork Queue, and ignored a few >> that failed, which might explain the problem (and would this lead to >> problems in the future, if so, how do I go about fixing it). >> > > One way you can do it is by doing a manual rebase of your fork from your > local repository. You will want to look at git-rebase and git-pull manuals > to get that done. > > What you want to do first is in your master branch, you get the changes from > the 'upstream' branch. Quoting from Github's documentation on Forking > (http://help.github.com/forking/): > >> Pulling in upstream changes >> >> Some time has passed, the upstream repo has changed and you want to update >> your fork before you submit a new patch. There are two ways to do this: >> >> $ git fetch upstream master >> >> $ git merge upstream/master >> >> $ git pull upstream master >> >> git pull is a more direct way, but the merge it performs can be confusing >> if the user doesn’t expect it and a merge conflict results. git fetch will >> also grab all branches, where git pull will only grab the one specified. >> >> If you have local commits that are not in the upstream branch, a normal >> merge will occur. If your local commits are in the upstream branch, a >> fast-forward merge will be done, moving your local branch to the same commit >> as upstream/master. If both repos have edits to the same location in the >> same file, you may run into a merge conflict. Conflicts must be resolved by >> hand and a commit made to complete the merge. >> >> Now that your local branch has been updated, you can commit, push, and >> send a pull request. >> >> You may wish to do the fetch and merge manually, instead of letting >> git-pull do it for you. This can sometimes help avoid headaches caused by >> mysterious merge conflicts. > > (Sorry for the HTML email, I just found it might work better for quoting). > HTH > > Sorry to be such a pain, but all githell seems to break loose when try those commands on my fork, I think I'm going to delete it and simply follow the documentation this time (which I should've the first) :( Jeroen |
|
From: Dean M. B. <mik...@gm...> - 2010-01-10 18:22:39
|
On Mon, Jan 11, 2010 at 2:16 AM, Jeroen Habraken <vex...@gm...> wrote: > > Sorry to be such a pain, but all githell seems to break loose when try > those commands on my fork, I think I'm going to delete it and simply > follow the documentation this time (which I should've the first) :( > No worries, it's all good. :) -- Dean Michael Berris cplusplus-soup.com | twitter.com/deanberris linkedin.com/in/mikhailberis | facebook.com/dean.berris | deanberris.com |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X