pharo-vcs / iceberg

Iceberg is the main toolset for handling VCS in Pharo.
MIT License
133 stars 84 forks source link

be able to fetch remote changes of any branch #920

Closed demarey closed 6 years ago

demarey commented 6 years ago

Currently, it is possible to fetch changes from the upstream of the current branch but there is no way to fetch changes from a remote to your local repository of any branch.

guillep commented 6 years ago

Let me rephrase what I understand from your issue.

  1. you have local branches A and B
  2. your working copy is on A
  3. remotely, there are new changes on B

This is not possible right now and we think this can cause more problems than solutions. Because pulling changes provokes always merge. In the happy cases, the merge will be a fast forward without conflicts, but in the case it is not you will need to solve conflicts, and that requires to modify code. Even, you will want to be able to test it. So it is much better if you checkout "local/B" and then pull, solve your conflicts, and finally go back to "local/A"

If this is the case, this can be done with the merge dialog, I don't see the issue.

Even worst, using git from the command line you need to do the same to update a branch. You first checkout the branch to update and then pull. So in both cases, I don't think this is a valid issue.

demarey commented 6 years ago

I meant fetch changes from "remote/B" to "local/B" without checking out "local/B". I would like to have this option to get commits that I do not have for an already defined remote. This way, I will then be able to choose the commit I want to merge for example.

guillep commented 6 years ago

But that is called merge :P

On Thu, Sep 6, 2018 at 11:10 AM demarey notifications@github.com wrote:

I meant fetch changes from "remote/B" to "local/B" without checking out "local/B". I would like to have this option to get commits that I do not have for an already defined remote. This way, I will then be able to choose the commit I want to merge for example.

— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub https://github.com/pharo-vcs/iceberg/issues/920#issuecomment-419022418, or mute the thread https://github.com/notifications/unsubscribe-auth/AArO4ul_4BO0Xyvz7OYPXAxDGL8pVtIEks5uYOZ5gaJpZM4VOh2Y .

--

Guille Polito

Research Engineer

Centre de Recherche en Informatique, Signal et Automatique de Lille

CRIStAL - UMR 9189

French National Center for Scientific Research - http://www.cnrs.fr http://www.cnrs.fr

Web: http://guillep.github.io http://guillep.github.io

Phone: +33 06 52 70 66 13

demarey commented 6 years ago

The thing is that if the remote commit you want to merge is not already fetch, you cannot merge it from the UI. That's why I asked to be able to fetch a remote. By the way, I just notice it is now implemented. When right-clicking on a remote, you can now fetch it.