Re: [Rails-devel] Rails2.0: (Almost) all of Rails 1.x merged

[brett l. <bre...@gm...>]

On Sat, Oct 6, 2012 at 9:48 AM, Erik Vos <eri...@xs...> wrote:
>> Testing of Rails2.0 in development is already possible by fetching the git
>> branch.
>
> Trying to fetch Rails2.0, but no luck.
>
> What I have sorted out so far are the following commands:
>
> - git fetch origin rails2.0
> That seems to do something, although 'git branch -r' still only reports
> origin/master.
>

"git fetch" is all you need. It will fetch all changesets across all
remote branches.

> - git checkout -b rails2.0 origin/rails2.0
> That fails with the apparently well-known message "fatal: git checkout:
> updating paths is incompatible with switching branches. Did you intend...
> etc.".
> Adding --track does not help. Doing a 'git pull' first (an advice I found
> somewhere) does neither.
>
> What am I doing wrong?  Please note, that I have configured the bare 'git
> push'/'git pull' to transmit branch 'master' only.
> I don't have a local Rails2.0 branch yet, which I understand is the proper
> way to set it up this way.
>

Once you do a fetch or pull without arguments, it should pull down
references to any branches you're missing.

If this fails, can you show what "git config --list" and "git branch -r" shows?

> Erik.
>
>


---Brett