+- webERP Forum (http://www.weberp.org/forum)
+-- Forum: webERP Discussion (http://www.weberp.org/forum/forumdisplay.php?fid=1)
+--- Forum: Development Discussion & Specification (http://www.weberp.org/forum/forumdisplay.php?fid=10)
+--- Thread: Sourceforge subversion problem (/showthread.php?tid=8066)
RE: Sourceforge subversion problem - TurboPT - 03-01-2018
There should be a pull request, if I did it correctly.
RE: Sourceforge subversion problem - TimSchofield - 03-01-2018
The pull request didn't come to me. I can see you merging a pull request here https://github.com/TurboPT/webERP-svn/commit/b41ef95d023c4e559bb739112e0cb234ccb119f1 into your repository. Can you try creating one against my repository?
Tim
RE: Sourceforge subversion problem - TurboPT - 03-01-2018
Ok, pull created against the other repository.
RE: Sourceforge subversion problem - TimSchofield - 03-01-2018
I see it, looks OK I will review and pull it later.
Tim
RE: Sourceforge subversion problem - TurboPT - 03-01-2018
No problem, whenever you feel like getting to it.
RE: Sourceforge subversion problem - TimSchofield - 03-01-2018
Well family comes before merging
I have pulled those commits into my repository now.
Tim
RE: Sourceforge subversion problem - TurboPT - 03-01-2018
Yep, family first!
I am still cross checking the prior SVN commits at SF, but it looks like their site is suddenly having trouble (again) at the moment.
I want to ensure that all the changes over the past ~3 months are present. I was surprised to find that the EDIMessageFormat file had issues.
Did you say that the TestPlanResults patch was ok? I don't see the expected changes from the patch unless the file needs a commit?
(If necessary, I can commit the changes as I've been doing with the other files)
RE: Sourceforge subversion problem - phil - 03-01-2018
So now we can just clone
https://github.com/timschofield/webERP-svn
into https://github.com/webERP-team/webERP
?
Thanks Tim/Paul
RE: Sourceforge subversion problem - afcouling - 03-01-2018
I'm still getting used to Git terminology...
Rather than clone, wouldn't it be a fork of https://github.com/timschofield/webERP-svn into https://github.com/webERP-team/webERP ??
Tim, does a fork retain the version history of its parent?
Andy.
RE: Sourceforge subversion problem - TurboPT - 03-01-2018
Phil,
I still have a few files to cover, but SF appears to be in static mode at the moment.
After ensuring that the changes are caught-up, the webERP-team can fork Tim's repository, and then that would be cloned into the webERP-team after forking.