Re: [Scons-dev] Hg vs Git

[rupert THURNER]

On Nov 28, 2016 10:42, "Russel Winder"  wrote:
>
> On Sun, 2016-11-27 at 14:11 -0500, Jonathon Reinhart wrote:
> > Personally, I find the rewriting extremely powerful for my local
> > development - I can re-arrange, split, and join commits in my feature
> > branch before it is merged into master. Very few people are
> > interested in
> > rewriting history of a published tree.
>
> I have never been a user of history rewriting as I tend to publish all
> my repositories all the time. Maybe my workfow and approach is wrong,
> and that I should keep all work private and so rebasable and squashable
> in both Hg and Git until the point of publishing for the pull request?

Personally I like somebody else looking at my commit, giving feedback and I
then improve it. There are many ways to achieve this. You could just share
via email like done in Linux. Change a commit for a new pull request. Do a
git Gerrit like workflow and push to a mutable branch. Mercurial goes a
step further and marks commits as "draft". A little bit long but might be
worth a read:
http://www.gerg.ca/evolve/sharing.html,
http://gregoryszorc.com/blog/2014/06/23/please-stop-using-mq/

Rupert
___
Scons-dev mailing list
Scons-dev@scons.org
https://pairlist2.pair.net/mailman/listinfo/scons-dev

Re: [Scons-dev] Hg vs Git

[rupert THURNER]

On Sun, Nov 27, 2016 at 11:59 AM, Russel Winder 
wrote:

> On Fri, 2016-11-25 at 18:42 -0500, Jonathon Reinhart wrote:
> > Dirk Bächle  writes:
> >
> > > I *don't* want the history in my repos to be mutable...
> >
> > All of the major Git hosting providers have *protected branches*
> > which are
> > immutable.
>
> But isn't that a red herring? Git hosters are just a final mainline
> hoster imposing CVCS models. Git is all about DVCS ostensibly, though
> more and more people are reverting to CVCS with local caching as their
> working model because of GitHub, GitLab, BitBucket.
>
> The point here is that someone can mutate a branch locally and then
> force it to the mainline. Some people think this a good thing.
> Especially with the rise on GitHub of the habit of pull requests
> demanding commit squashing.
>

sorry for posting here, i usually just lurk on this list because i am
interested in build tools. i doubt that mercurial will die out - their
mailing list seems more busy than ever. history rewrite can be done with
mercurial nowadays with extensions, and will come even more, just note
facebooks "hg absorb" extension. a nice write up about future plans from
the mozilla dev list:
https://groups.google.com/d/topic/mozilla.dev.version-control/nh4fITFlEMk/discussion


rupert
___
Scons-dev mailing list
Scons-dev@scons.org
https://pairlist2.pair.net/mailman/listinfo/scons-dev