[conversion] Progress Report
We are very close to being able to go live with boostorg at GitHub. * Following the instructions at https://svn.boost.org/trac/boost/wiki/TryModBoost, the "master" branch seems ready to go. * A couple of libraries on the "develop" branch may still have end-of-line issues. If so, those should be resolved first thing in the morning. So please be patient one more day, and then we should be able to get to work using git and modular boost. --Beman
Le 02/12/13 00:41, Beman Dawes a écrit :
We are very close to being able to go live with boostorg at GitHub.
* Following the instructions at https://svn.boost.org/trac/boost/wiki/TryModBoost, the "master" branch seems ready to go.
* A couple of libraries on the "develop" branch may still have end-of-line issues. If so, those should be resolved first thing in the morning.
So please be patient one more day, and then we should be able to get to work using git and modular boost.
Hi, Are the test results visible? Vicente
On Sun, Dec 1, 2013 at 6:45 PM, Vicente J. Botet Escriba < vicente.botet@wanadoo.fr> wrote:
Le 02/12/13 00:41, Beman Dawes a écrit :
We are very close to being able to go live with boostorg at GitHub.
* Following the instructions at https://svn.boost.org/trac/boost/wiki/TryModBoost, the "master" branch seems ready to go.
* A couple of libraries on the "develop" branch may still have end-of-line issues. If so, those should be resolved first thing in the morning.
So please be patient one more day, and then we should be able to get to work using git and modular boost.
Hi,
Are the test results visible?
Yes. Follow the instructions at https://svn.boost.org/trac/boost/wiki/TryModBoost If you have already done "git clone --recursive git@github.com:boostorg/boost.git modular-boost" then you can try: cd modular-boost git pull git submodule update git status git status should report: # On branch master nothing to commit, working directory clean --Beman
On 02/12/13 16:07, Beman Dawes wrote:
On Sun, Dec 1, 2013 at 6:45 PM, Vicente J. Botet Escriba < vicente.botet@wanadoo.fr> wrote:
Are the test results visible?
Yes. Follow the instructions at https://svn.boost.org/trac/boost/wiki/TryModBoost
Should test runners be doing something different or will the scripts be updated? Ben
On 12/2/2013 12:07 AM, Beman Dawes wrote:
On Sun, Dec 1, 2013 at 6:45 PM, Vicente J. Botet Escriba < vicente.botet@wanadoo.fr> wrote:
Le 02/12/13 00:41, Beman Dawes a écrit :
We are very close to being able to go live with boostorg at GitHub.
* Following the instructions at https://svn.boost.org/trac/boost/wiki/TryModBoost, the "master" branch seems ready to go.
* A couple of libraries on the "develop" branch may still have end-of-line issues. If so, those should be resolved first thing in the morning.
So please be patient one more day, and then we should be able to get to work using git and modular boost.
Hi,
Are the test results visible?
Yes. Follow the instructions at https://svn.boost.org/trac/boost/wiki/TryModBoost
If you have already done "git clone --recursive git@github.com:boostorg/boost.git modular-boost" then you can try:
cd modular-boost git pull git submodule update
This fails for me with: Submodule path 'libs/interprocess': checked out 'befc284064603b2ffc985b29e17a99c4664c21bf' error: Your local changes to the following files would be overwritten by checkout: proj/vc7ide/avl_multiset/avl_multiset.vcproj proj/vc7ide/avl_set/avl_set.vcproj proj/vc7ide/sg_multiset/sg_multiset.vcproj proj/vc7ide/sg_set/sg_set.vcproj proj/vc7ide/splay_multiset/splay_multiset.vcproj proj/vc7ide/splay_set/splay_set.vcproj Please, commit your changes or stash them before you can switch branches. Aborting When I cd to libs/interprocess and do git status, I see this: # HEAD detached at ad3603e # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: proj/vc7ide/avl_multiset/avl_multiset.vcproj # modified: proj/vc7ide/avl_set/avl_set.vcproj # modified: proj/vc7ide/sg_multiset/sg_multiset.vcproj # modified: proj/vc7ide/sg_set/sg_set.vcproj # modified: proj/vc7ide/splay_multiset/splay_multiset.vcproj # modified: proj/vc7ide/splay_set/splay_set.vcproj If I do a git reset --hard to try to discard these changes (which I didn't make), nothing happens. The files still show up as modified. So I can't make git submodule update succeed no matter what I try. I'm stuck. Suggestions? Eric
On 2 December 2013 09:14, Eric Niebler <eric.niebler@gmail.com> wrote:
So I can't make git submodule update succeed no matter what I try. I'm stuck. Suggestions?
This should be fixed in the latest version, so the easiest solution is a fresh clone. But I found that if you delete the problematic files, then you can update the repo to the latest version and restore the files afterwards.
FYI, I believe the correct way to eliminate untracked changes is to use "git clean." The command "git reset" pertains to things committed locally. See for example, http://gitready.com/beginner/2009/01/16/cleaning-up-untracked-files.html On Mon, Dec 2, 2013 at 4:14 AM, Eric Niebler <eric.niebler@gmail.com> wrote:
On 12/2/2013 12:07 AM, Beman Dawes wrote:
On Sun, Dec 1, 2013 at 6:45 PM, Vicente J. Botet Escriba < vicente.botet@wanadoo.fr> wrote:
Le 02/12/13 00:41, Beman Dawes a écrit :
We are very close to being able to go live with boostorg at GitHub.
* Following the instructions at https://svn.boost.org/trac/boost/wiki/TryModBoost, the "master" branch seems ready to go.
* A couple of libraries on the "develop" branch may still have
end-of-line
issues. If so, those should be resolved first thing in the morning.
So please be patient one more day, and then we should be able to get to work using git and modular boost.
Hi,
Are the test results visible?
Yes. Follow the instructions at https://svn.boost.org/trac/boost/wiki/TryModBoost
If you have already done "git clone --recursive git@github.com:boostorg/boost.git modular-boost" then you can try:
cd modular-boost git pull git submodule update
This fails for me with:
Submodule path 'libs/interprocess': checked out 'befc284064603b2ffc985b29e17a99c4664c21bf' error: Your local changes to the following files would be overwritten by checkout: proj/vc7ide/avl_multiset/avl_multiset.vcproj proj/vc7ide/avl_set/avl_set.vcproj proj/vc7ide/sg_multiset/sg_multiset.vcproj proj/vc7ide/sg_set/sg_set.vcproj proj/vc7ide/splay_multiset/splay_multiset.vcproj proj/vc7ide/splay_set/splay_set.vcproj Please, commit your changes or stash them before you can switch branches. Aborting
When I cd to libs/interprocess and do git status, I see this:
# HEAD detached at ad3603e # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: proj/vc7ide/avl_multiset/avl_multiset.vcproj # modified: proj/vc7ide/avl_set/avl_set.vcproj # modified: proj/vc7ide/sg_multiset/sg_multiset.vcproj # modified: proj/vc7ide/sg_set/sg_set.vcproj # modified: proj/vc7ide/splay_multiset/splay_multiset.vcproj # modified: proj/vc7ide/splay_set/splay_set.vcproj
If I do a git reset --hard to try to discard these changes (which I didn't make), nothing happens. The files still show up as modified.
So I can't make git submodule update succeed no matter what I try. I'm stuck. Suggestions?
Eric
_______________________________________________ Unsubscribe & other changes: http://lists.boost.org/mailman/listinfo.cgi/boost
If I do a git reset --hard to try to discard these changes (which I didn't make), nothing happens. The files still show up as modified.
So I can't make git submodule update succeed no matter what I try. I'm stuck. Suggestions?
Does "git stash" also exhibit the same behavior? Philippe
On Mon, Dec 2, 2013 at 4:14 AM, Eric Niebler <eric.niebler@gmail.com> wrote:
...
If you have already done "git clone --recursive git@github.com:boostorg/boost.git modular-boost" then you can try:
cd modular-boost git pull git submodule update
This fails for me with: ...
This has worked for me: git submodule update -f --Beman
Le 02/12/13 09:07, Beman Dawes a écrit :
On Sun, Dec 1, 2013 at 6:45 PM, Vicente J. Botet Escriba < vicente.botet@wanadoo.fr> wrote:
Le 02/12/13 00:41, Beman Dawes a écrit :
We are very close to being able to go live with boostorg at GitHub.
* Following the instructions at https://svn.boost.org/trac/boost/wiki/TryModBoost, the "master" branch seems ready to go.
* A couple of libraries on the "develop" branch may still have end-of-line issues. If so, those should be resolved first thing in the morning.
So please be patient one more day, and then we should be able to get to work using git and modular boost.
Hi, Are the test results visible?
Yes. Follow the instructions at https://svn.boost.org/trac/boost/wiki/TryModBoost
If you have already done "git clone --recursive git@github.com:boostorg/boost.git modular-boost" then you can try:
cd modular-boost git pull git submodule update git status
git status should report:
# On branch master nothing to commit, working directory clean
I've already done that. I was asking for the test results of the tester runing the git repository so that we can compare with the testers running the svn repository. Vicente
On 2 December 2013 18:18, Vicente J. Botet Escriba <vicente.botet@wanadoo.fr> wrote:
I've already done that. I was asking for the test results of the tester runing the git repository so that we can compare with the testers running the svn repository.
The testers aren't running yet, because no one has converted the scripts.
On Mon, Dec 2, 2013 at 1:22 PM, Daniel James <daniel@calamity.org.uk> wrote:
On 2 December 2013 18:18, Vicente J. Botet Escriba <vicente.botet@wanadoo.fr> wrote:
I've already done that. I was asking for the test results of the tester runing the git repository so that we can compare with the testers running the svn repository.
The testers aren't running yet, because no one has converted the scripts.
Rene has started, but has been traveling and hasn't been able to test his revisions. Now that we are opening the GitHub boostorg repos, I'm hoping that will make his testing easier. --Beman
On Mon, Dec 2, 2013 at 1:25 PM, Beman Dawes <bdawes@acm.org> wrote:
On Mon, Dec 2, 2013 at 1:22 PM, Daniel James <daniel@calamity.org.uk> wrote:
On 2 December 2013 18:18, Vicente J. Botet Escriba <vicente.botet@wanadoo.fr> wrote:
I've already done that. I was asking for the test results of the tester runing the git repository so that we can compare with the testers
running
the svn repository.
The testers aren't running yet, because no one has converted the scripts.
Rene has started, but has been traveling and hasn't been able to test his revisions.
Now that we are opening the GitHub boostorg repos, I'm hoping that will make his testing easier.
It will.. But see my posts from yesterday about git problems I'm having. -- -- -- Grafik - Don't Assume Anything -- Redshift Software, Inc. - http://redshift-software.com -- rrivera/acm.org - grafik/redshift-software.com -- 102708583/icq - grafikrobot/aim - grafikrobot/yahoo
participants (8)
-
Beman Dawes -
Ben Pope -
Daniel James -
Eric Niebler -
Jeremy Ong -
Philippe Vaucher -
Rene Rivera -
Vicente J. Botet Escriba