Jump to content


Feature (or advice) Request: using swarm to commit proposed integrations

swarm integration review submit commit

  • Please log in to reply
3 replies to this topic

#1 PeteS

PeteS

    Advanced Member

  • Members
  • PipPipPip
  • 62 posts

Posted 16 April 2015 - 03:06 PM

Looking for advice, or potentially a new feature request WRT integrating approved changes. Here's our workflow: We have a "WIP" branch where most of our mainline development and QA occurs, and we have a 'released' branch for the currently relased version of the product.

Say a bug is found on 'WIP', a developer checks in a change to fix it. We want him to request a review, asking for that change to be integrated to 'release'. Currently we have a few choices:
  • Have the developer integrate the change to 'release' himself, shelving the integration, then request a review on the shelf, or
  • Have the original change approved and have a release manager integrate the change and commit it to 'release'
What we'd really like to do is have a reviewer or release manager "Approve & Integrate", similar to "Approve & Commit". Is this something that could be added, or if not, how do others deal with requests for integrations?

Note that is also a tangential issue when using "Approve & Commit", where other changes have been checked in for a file in a shelved changelist, and there fore needs to be resolved before committing. Since the reviewer who would do the commit doesn't have direct access to the developers shelf, there's currently no good way in Swarm to resolve the shelved changes & update the shelf for review & commit.

Thanks,
Pete

#2 P4Shimada

P4Shimada

    Advanced Member

  • Members
  • PipPipPip
  • 831 posts

Posted 17 April 2015 - 12:11 AM

Hi Pete,

Thanks for the feedback and the workflow example. I have created an enhancement request, on your behalf, to allow a reviewer "Approve & Integrate" shelved changes of other user. I added your comments. If it becomes implemented in the future, you will be notified.

#3 P4TomT

P4TomT

    Member

  • Staff Moderators
  • 10 posts
  • LocationNashua, NH, USA

Posted 17 April 2015 - 03:17 PM

Hello, Pete!

   The "Approve and Integrate" workflow you describes is getting more popular these days.  From a consulting and custom solutions perspective, this seems to be a logical extension of the Auto Merge consulting project we did for a customer.  The AutoMerge project addresses some of the mechanics you might need to deal with if you implemented the workflow on your own.  Things like figuring out who to notify (and nag) when a merge needs human intervention.

Sample code is available in The Workshop:  https://swarm.worksh...tware-automerge

Some inspiration for this came from:  http://www.perforce....tomated-merging

Getting what you really want would entail shelving triggers to hook into the "Approve" process somehow, e.g. adding an "#integrate" tag to the shelved changelist description to kick off the integration.

That's thinking in terms of how to do it as a custom solution.  I'll also be following your feature request with great interest, and lobbying for it.

Cheers!

Tom

Perforce Software, Consulting Services
C. Thomas Tyler
Perforce Software
Consulting Services
Phone: +1 (603) 595-9670
Mobile: +1 (617) 513-2414
Email: consulting@perforce.com
Twitter: @cttyler

P4Blog: http://blog.perforce.com

Get peace of mind with Perforce experts on your team!
Perforce Remote Administration Program: http://bit.ly/PerforceRA

#4 mcru

mcru

    Advanced Member

  • Members
  • PipPipPip
  • 63 posts

Posted 04 January 2017 - 10:50 PM

Just following up on this, as I'm pretty sure I'll be building this custom functionality in the next couple weeks ;)

Has this feature been proposed, or has a good custom solution already been documented in a KB anywhere? Thanks!



Also tagged with one or more of these keywords: swarm, integration, review, submit, commit

0 user(s) are reading this topic

0 members, 0 guests, 0 anonymous users