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

Mathias Behrle <[email protected]> Sat, 19 Jan 2019 13:11:07 +0100
Newsgroups	gmane.comp.bug-tracking.roundup.devel
Organization	MBSolutions
Message-ID	<[email protected]>
* Ralf Schlatterbeck: " Re: [Roundup-devel] REST-API: Merging/Rebasing with
  Mercurial?" (Fri, 18 Jan 2019 21:00:12 +0100):

Re-adding the list, that was probably not intentionally dropped .

> On Fri, Jan 18, 2019 at 06:06:12PM +0100, Mathias Behrle wrote:
> > * Ralf Schlatterbeck: " [Roundup-devel] REST-API: Merging/Rebasing with
> >   Mercurial?" (Fri, 18 Jan 2019 16:06:39 +0100):
> >   
> > > As you may know we had a Google Summer of Code (GSoC) Project in 2015
> > > that added a REST-API to roundup. I'd like to integrate this code.
> > > The original announcement is at
> > > https://sourceforge.net/p/roundup/mailman/message/34436352/
> > > and there is also an issue in the tracker:
> > > https://issues.roundup-tracker.org/issue2550734  
> > 
> > Interesting!
> >   
> > > If our version-control system was git I'd add a new remote to my
> > > checkout of roundup, pull the repo above into a new local branch, rebase
> > > to the current master and start fixing python3 compatibility issues and
> > > adding documentation.
> > > 
> > > Can someone outline how to achieve this with mercurial?  
> > 
> > Basically it works like that:
> > 
> > hg pull -f <other_repos>
> > hg checkout <own_branch_to_update>
> > hg merge <foreign_branch_to_merge>
> > hg commit  
> 
> OK, that at least tells me how to add a second repo.
> No way to rebase to head (without merging) in hg?
> I'd like to not introduce lots of artefacts from merging in the
> history.

I don't know what you mean by 'artifacts', but the commits of the REST branch
will be introduced in the history by merging as well as by rebasing. Rebasing is
basically a sort of internal merge, it only tries to re-order the changesets
*as if* they were made on top of the existing branch.
I think rebasing will not work well in this case if at all, at least conflict
resolution will be harder. A lot has changed since the REST branch was forked
and merging it will run into a number of conflicts that have to be resolved
anyway.

If you don't want to have the history of the REST branch (but rather an
overview of the complete changes and collapse the multiple changesets into one)
you also could extract the pure changes made by Chau Nguyen by making a diff
between 
https://bitbucket.org/kinggreedy1991/roundup-bpo/commits/d10821d84c4cc0c0e60bf6e38b170eed1b9a990f
and
https://bitbucket.org/kinggreedy1991/roundup-bpo/commits/7f2ad229b72595ff48e821755c50d6f1acacd833
and re-apply the diff on tip.

Mathias


-- 

    Mathias Behrle
    MBSolutions
    Gilgenmatten 10 A
    D-79114 Freiburg

    Tel: +49(761)471023
    Fax: +49(761)4770816
    http://www.m9s.biz
    UStIdNr: DE 142009020
    PGP/GnuPG key availabable from any keyserver, ID: 0xD6D09BE48405BBF6
    AC29 7E5C 46B9 D0B6 1C71  7681 D6D0 9BE4 8405 BBF6

_______________________________________________
Roundup-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/roundup-devel
signature.asc (application/pgp-signature, 867 B)