Custom mergebot for mixed trunk/branch based development

[David Cañadas]

Hi Plastic guys,

We at Smilegate are working with a mixed environment (trunk for Artists and Designers, branches for Programmers) and are strongly planning to write our own mergebot (as we have a custom solution for other pipeline related things like building code or cooking data). The reason behind that is that we need some additional features on top of the mergebot so we can have full control on how things are merged and specially, when.

I've read you're merge bot docs and posts at https://blog.plasticscm.com/2018/09/add-mergebot-to-your-repo.html and https://blog.plasticscm.com/2018/09/mergebot-story-of-our-devops-initiative.html (among others) and in the second one I've found this sentence "convert the shelve into a regular checkin" which I don't know exactly what it means. Is this just checking in the shelf? Is it merging the shelf source into the destination branch? Or is it something else? If it is something else, is there a command line to perform this operation so I can easily convert a shelf into a checkin with proper merge tracking (we want to see the merge arrows in the Branch Explorer to keep file history)?

Thank you!

[calbzam]

Hi David,

The mergebot runs a merge of the previously created shelve to apply it to the destination branch.

Regards,

Carlos.