The issue is that we should not be commiting anything to the master branch. The master branch only accepts merges from the develop branch. Also the ublas/ublas master and the boostorg/ublas branches has to be always (except when requesting a pull of course) the same.

Can you please perform the changes so we make sure that everything is in compliance?


In general:
A. development:
Commit into ublas/ublas develop or appropraite branches ( bug, feature etc)

B. Regression testing:
- merge first into ublas/ublas develop (if you are using another branch) and then make a pull request in to boostorg/ublas develop from ublas/ublas develop.

- wait a few days for the results to show in http://www.boost.org/development/tests/develop/developer/numeric-ublas.html

C. Merging into master (only at release dates):
merge from ublas/ublas develop in ublas/ublas master and then make a pull request to boostorg/ublas master

Let me know if this is not clear enough.

Please remember medium to big feature packs better be in their own branch and not just in develop.

Thank you!
Nasos

On 07/27/2015 12:29 PM, Rajaditya Mukherjee wrote:
Hi Nasos, 

This is my commit. Is there somethign wrong? 

I usually check everything into the separate branch. Please let me know ASAP. 

Rajaditya Mukherjee
3rd Year Graduate Student
Dept. of Computer Science and Engineering
The Ohio State University
Columbus, Ohio
Tel :- +1-(614)-271-4439


On Mon, Jul 27, 2015 at 12:05 PM, Nasos Iliopoulos <nasos_i@hotmail.com> wrote:
David,
can we undo this commit on master in uBlas/uBlas?

 https://github.com/boostorg/ublas/commit/bdfbbc4d8c343fc173ef5f403a982edb337821a0

and move this one to the develop branch in uBlas/uBlas?
https://github.com/boostorg/ublas/commit/21b73190b2d7c35da4ec48277106d7cd99c8efc1

we are stuck with further commits and it would be bad to keep the master at this state.

-Nasos



On 05/26/2015 09:45 AM, Nasos Iliopoulos wrote:
There is some code that shoulnd't be in ublas/master and I have asked for it to be removed. After that I will push a pull request to boostorg/ublas master and make sure the two masters are the same.

I made some changes and you should be able to init from the repository. It will start in a detached state but you can switch to master after that. You will need to pull again after the master is back to normal.

-Nasos
 

On 05/22/2015 06:14 PM, Joaquim Duran Comas wrote:
Hello all,

I've created a Windows based virtual machine. I would like to clone modular-boost as shown in the instruccions of the wiki, but it is not possible to checkout ublas:

C:\Users\qduran\development\modular-boost>"c:\Program Files (x86)\Git\
bin/git" submodule update --init --recursive
fatal: reference is not a tree: 6ef6cd8ba14d5a5e109324c5c781a2a407d8767f

The commit 6ef6cd8ba14d5a5e109324c5c781a2a407d8767f is only present in boostorg/ublas master branch. I remembed that this issue also occured previously.

Thanks and Best Regards,
Joaquim Duran



_______________________________________________
ublas mailing list
ublas@lists.boost.org
http://lists.boost.org/mailman/listinfo.cgi/ublas
Sent to: athanasios.iliopoulos.ctr.gr@nrl.navy.mil



_______________________________________________
ublas mailing list
ublas@lists.boost.org
http://lists.boost.org/mailman/listinfo.cgi/ublas

Sent to: nasos_i@hotmail.com


_______________________________________________
ublas mailing list
ublas@lists.boost.org
http://lists.boost.org/mailman/listinfo.cgi/ublas
Sent to: rajaditya.mukherjee@gmail.com



_______________________________________________
ublas mailing list
ublas@lists.boost.org
http://lists.boost.org/mailman/listinfo.cgi/ublas
Sent to: athanasios.iliopoulos.ctr.gr@nrl.navy.mil