Re: [boost] [conversion] Progress Report

Subject: Re: [boost] [conversion] Progress Report
From: Jeremy Ong (jeremycong_at_[hidden])
Date: 2013-12-02 04:42:31

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_at_[hidden]> 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_at_[hidden]> 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_at_[hidden]: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
>