[Nix-dev] A Journey into our brand-new Haskell infrastructure: Part III

[James Cook]

I am usually a fan of merging instead of rebasing, but won't the destroyed
history here just be an enormous number of boring automatic snapshots of
hackage? That doesn't have much to do with nixpkgs, and surely the history
of hackage is being archived somewhere else.

(If a bunch of people were using these snapshots before they get merged or
rebased, I might feel differently.)

James
On May 2, 2015 14:53, "Matthias Beyer" <mail at beyermatthias.de> wrote:

> Hi,
>
> On 27-04-2015 13:40:08, Peter Simons wrote:
> > just a quick update for your information: we now have fully automatic
> updates
> > of "hackages-packages.nix".
>
> This sounds really great!
>
> >
> > We do not merge those updates to 'master' automatically, though.
> Instead, a
> > human being can decide to do that by choosing a relatively stable
> version of
> > Hackage from [5] and merging revision into 'master'. Personally, I like
> to
> > squash all those commits into one by running
> >
> >   $ git checkout master && git pull
> >   $ git checkout haskell-updates && git pull
> >   $ git rebase -i master
> >
> > Now select "squash" for all but the first commit, and when Git asks you
> to edit
> > the final commit message, make sure to chose the *last one*. Then push
> the
> > result to the origin repository:
> >
>
> May I ask why you'd prefer this over a "normal" `git merge` of the
> appropriate tree?
>
> By doing so, you'd actually destroy history which might be relevant
> some day...
>
> I'm generally not a fan of the github workflow, meaning rebasing
> instead of merging, so I'll guess we'll end up in a discussion about
> merging strategies if you don't mind?
>
>
> --
> Mit freundlichen Grüßen,
> Kind regards,
> Matthias Beyer
>
> Proudly sent with mutt.
> Happily signed with gnupg.
>
> _______________________________________________
> nix-dev mailing list
> nix-dev at lists.science.uu.nl
> http://lists.science.uu.nl/mailman/listinfo/nix-dev
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.science.uu.nl/pipermail/nix-dev/attachments/20150502/66c9e0d2/attachment.html