Re: REST-API: Merging/Rebasing with Mercurial?

On Wed, Jan 30, 2019 at 08:42:28PM +0000, Joseph Myers wrote:
> On Wed, 30 Jan 2019, Ralf Schlatterbeck wrote:
> 
> > On Wed, Jan 30, 2019 at 06:35:51PM +0100, Ralf Schlatterbeck wrote:
> > > OK, I managed to convert the changes from the repo converted from git
> > > to a patchset using mq and apply this to a fresh SF checkout. Then I
> > > merged the branch and pushed the result.
> > 
> > I'm sorry, I just noticed that my attempt to use qpush has messed up the
> > date of all the commits, I'm sorry I didn't notice before pushing.
> > 
> > Can this be fixed somehow?
> > With git I'd have git push -f ...
> 
> I think force pushing is generally a bad idea with any distributed VCS if 
> the repository has more than one user, as it messes things up for people 
> who have pulled the changes.  (I also tend to find git histories with 
> author dates long behind the committer dates - often author dates relating 
> to some previous version of the patch without much resemblance to the 
> final version - rather confusing and unhelpful for finding discussions 
> relating to the final committed patch.  So I think commit dates reflecting 
> when the code was merged / rebased are fine.

Thanks
Git does to keep both, an Author Date and a Commit Date as well as an
Author and a Committer.
So if you're irritated in git you can fix what you get displayed by
showing the commit date. In this case either hg doesn't keep two dates
or my procedure has messed up the author date. At least in the github
converted repo the commits are also shown with my merge timestamp not
the original commit time-stamp which I would still prefer.

In the git-repo I did the merging I had for the last commit by Chau
Nguyen when looking with:

git log --stat --pretty=fuller

commit fed23596f4f813c511fe918cda1c82e36fb509b2
Author:     Chau Nguyen <[email protected]>
AuthorDate: Wed Aug 12 20:34:20 2015 +0300
Commit:     Ralf Schlatterbeck <[email protected]>
CommitDate: Wed Jan 30 10:26:35 2019 +0100

In the github repo these are messed up (either because hg can't
distinguish these dates or because I messed it up in hg with my procedure):

commit d68a317d0109c29f72dee2e8ae3b2631fdb8ab1a
Author:     Chau Nguyen <[email protected]>
AuthorDate: Wed Jan 30 10:26:35 2019 +0100
Commit:     Chau Nguyen <[email protected]>
CommitDate: Wed Jan 30 10:26:35 2019 +0100

That both, Commit and Author are the same suggests that hg doesn't track
Author and Committer separately. Another Argument againts hg in my
opinion.

Ralf
-- 
Dr. Ralf Schlatterbeck                  Tel:   +43/2243/26465-16
Open Source Consulting                  www:   http://www.runtux.com
Reichergasse 131, A-3411 Weidling       email: [email protected]