[GHC DevOps Group] The future of Phabricator
Ben Gamari
ben at smart-cactus.org
Fri Nov 2 14:07:18 UTC 2018
Ben Gamari <ben at smart-cactus.org> writes:
> Herbert Valerio Riedel <hvriedel at gmail.com> writes:
>
...
>> I wonder too how this is represented in GitLab... especially when a MR
>> is comprised of multiple commits, and those individual commits evolve,
>> might get reordered, commits added or removed fromt he stack, or when
>> the whole MR gets rebased in the process...
>
> To be clear, GitLab saves each head commit that you push to an MR
> branch. These iterations are known in the review interface as "versions".
> The review interface then allows you to view differences between either
>
> a. any two versions
> b. any version and the target branch (e.g. master)
>
> Unfortunately (but perhaps not unexpectedly) this scheme does not deal
> well with changes due to a change in base commit (as would happen in the
> case of rebasing). It appears that GitLab must just run `git diff`
> between the two heads when asked to compare two versions of a MR.
>
It sounds as though this is something on upstream's radar as something
to improve upon in the near future [1].
Cheers,
- Ben
[1] https://gitlab.com/gitlab-org/gitlab-ce/issues/23269
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 487 bytes
Desc: not available
URL: <http://mail.haskell.org/pipermail/ghc-devs/attachments/20181102/7d567363/attachment.sig>
More information about the ghc-devs
mailing list