hg-git broken on hg2.8?

Augie Fackler raf at durin42.com
Wed Dec 4 16:22:13 UTC 2013


On Wed, Dec 04, 2013 at 11:01:49AM -0500, Neal Becker wrote:
> ndarray has a submodule Boost.NumPy.
>
> Can hg-git handle this?
>
> It seems to have cloned so that the submodule is a git submodule.  I think
> I want hg here.  If that's even possible, would pushing back to github work?

I don't remember offhand. I feel like we have some support for turning
submodules into subrepos, but I don't remember if edits push back
correctly.

>
>
> On Wed, Dec 4, 2013 at 10:57 AM, Augie Fackler <raf at durin42.com> wrote:
>
> >
> >
> >
> > On Wed, Dec 4, 2013 at 10:56 AM, Neal Becker <ndbecker2 at gmail.com> wrote:
> >
> >> I can't seem to hg clone from github:
> >>
> >> hg clone https://github.com/ndarray/ndarray.git ndarray.hg
> >> real URL is https://github.com/ndarray/ndarray
> >> abort: HTTP Error 406: Not Acceptable
> >>
> >
> > Try git+https instead of https.
> >
> >
> >>
> >>
> >> On Wed, Dec 4, 2013 at 10:50 AM, Augie Fackler <raf at durin42.com> wrote:
> >>
> >>> On Wed, Dec 04, 2013 at 10:21:23AM -0500, Harvey Chapman wrote:
> >>> > On Dec 4, 2013, at 7:32 AM, Neal Becker <ndbecker2 at gmail.com> wrote:
> >>> >
> >>> > > A little better, but seems to only have gotten default branch:
> >>> > >
> >>> > > nbecker at nbecker1 ndarray.git$ git branch -a
> >>> > > * (detached from origin/#31)
> >>> > >   master
> >>> > >   remotes/origin/#22
> >>> > >   remotes/origin/#31
> >>> > >   remotes/origin/HEAD -> origin/master
> >>> > >   remotes/origin/master
> >>> > >
> >>> > > nbecker at nbecker1 ~$ hg clone ndarray.git ndarray.hg
> >>> > > nbecker at nbecker1 ndarray.hg$ hg branches
> >>> > > default                      139:657c4b861985
> >>> > > nbecker at nbecker1 ndarray.hg$ hg bookmarks
> >>> > >  * master                    139:657c4b861985
> >>> >
> >>> > In true git-fashion, it seems that hg-git only clones your local
> >>> branches. See below:
> >>>
> >>> Correct. That's the Right Behavior for cloning remote repositories,
> >>> which is the expected use case.
> >>>
> >>> Note taht as far as a 2.8-supporting hg-git, that's on my agenda for
> >>> the next few days. It's been a while since I had any time to dedicate
> >>> to hg-git.
> >>>
> >>> >
> >>> > ##### Clone using git (only master is checked out locally)
> >>> >
> >>> > $ git clone git at github.com:ndarray/ndarray.git
> >>> > …
> >>> > $ cd ndarray/
> >>> > ndarray $ git branch -a
> >>> > * master
> >>> >   remotes/origin/#22
> >>> >   remotes/origin/#31
> >>> >   remotes/origin/HEAD -> origin/master
> >>> >   remotes/origin/master
> >>> > ndarray $ cd ..
> >>> >
> >>> > ##### Clone using hg-git from guthub (all bookmarks are present)
> >>> >
> >>> > $ hg clone git+ssh://git@github.com/ndarray/ndarray.git hg_from_github
> >>> > …
> >>> > $ hg -R hg_from_github branches
> >>> > default                      141:ac6dc3aec777
> >>> > $ hg -R hg_from_github bookmarks
> >>> >    #22                       134:8b594c684804
> >>> >    #31                       141:ac6dc3aec777
> >>> >    master                    140:657c4b861985
> >>> >
> >>> > ##### Clone using hg-git of the local git repo (only the master
> >>> bookmark is present)
> >>> >
> >>> > $ hg clone ndarray hg_from_local
> >>> > …
> >>> > $ hg -R hg_from_local branches
> >>> > default                      139:657c4b861985
> >>> > $ hg -R hg_from_local bookmarks
> >>> >    master                    139:657c4b861985
> >>> >
> >>> > ##### In local git repo, track remote branches
> >>> >
> >>> > $ cd ndarray/
> >>> > ndarray $ git checkout -b origin/#22
> >>> > Switched to a new branch 'origin/#22'
> >>> > ndarray $ git checkout -b origin/#31
> >>> > Switched to a new branch 'origin/#31'
> >>> > ndarray $ git branch -a
> >>> >   master
> >>> >   origin/#22
> >>> > * origin/#31
> >>> >   remotes/origin/#22
> >>> >   remotes/origin/#31
> >>> >   remotes/origin/HEAD -> origin/master
> >>> >   remotes/origin/master
> >>> > ndarray $ cd ..
> >>> >
> >>> > ##### Clone using hg-git of the local git repo (all tracked-branch
> >>> bookmarks are present)
> >>> >
> >>> > $ hg clone ndarray hg_from_local_2
> >>> > ...
> >>> > $ hg -R hg_from_local_2 branches
> >>> > default                      139:657c4b861985
> >>> > $ hg -R hg_from_local_2 bookmarks
> >>> >    master                    139:657c4b861985
> >>> >    origin/#22                139:657c4b861985
> >>> >    origin/#31                139:657c4b861985
> >>> >
> >>> > _______________________________________________
> >>> > Mercurial mailing list
> >>> > Mercurial at selenic.com
> >>> > http://selenic.com/mailman/listinfo/mercurial
> >>>
> >>
> >>
> >



More information about the Mercurial mailing list