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

Joseph Myers <[email protected]>
Newsgroups gmane.comp.bug-tracking.roundup.devel
Message-ID <[email protected]>
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.

-- 
Joseph S. Myers
[email protected]
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.