Re: [Rails-devel] Idea: migrating away from cvs.

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

On Thu, Feb 4, 2010 at 1:09 PM, brett lentz <wak...@gm...> wrote:
> On Thu, Feb 4, 2010 at 12:34 PM, Erik Vos <eri...@xs...> wrote:
>>        1.  Test out the Git plugin for Eclipse. If the UI is similar enough
>>        to the CVS integration, we'll go with Git.
>> -------------
>>
>> [EV] While reading around on Git an Egit, the following worried me:
>>
>>          Pulling (merge or rebase) new changes from upstream
>>
>>        This is not yet available. Available alternatives currently include:
>>
>>            * run "git pull" from outside eclipse (but beware on Windows)
>>            * if you did no local change or want to discard your local
>> changes, use "Team/Reset To..."
>>
>>        Retrieved from "http://wiki.eclipse.org/EGit/User_Guide/Remote"
>>
>> Does this mean that Egit (the Eclipse plugin) has no equivalent for CVS
>> update from a remote repository?
>> That would rule it out for me. I don't want to be condemned to use the
>> (Windows) command line.
>>
>> For the rest, I don't care for the distributed model - I don't see why I
>> would need a local repository.
>> But I trust you if you say that it can be easily bypassed.
>>
>> Erik.
>>
>>
>
> wow... that's a major part of the git work flow that they haven't
> implemented.  i'm kind of surprised by that.
>
> ---Brett.
>

Ah ha. After some more googling, I see why.

"git pull" is synonymous with "git fetch && git merge".   In plain
english, "Fetch remote changesets, and update the database. Then, if
that succeeds, update the local working copy with the updated
changes."

Egit didn't have a merge algorithm implemented yet.

However, I found this: http://egit.eclipse.org/r/#change,140

Looks like they've finally gotten a merge algorithm implemented, which
means 'git pull' is probably going to show up in the next version or
two.

Awesome.   I'm not planning on doing the migrations _today_, so we can
take our time testing out eGit and see if they can get the feature
added sometime in the next month or two.

---Brett.