Jump to content

Delete files from child stream, but reintegrate them later

streams integrate

  • Please log in to reply
1 reply to this topic

#1 ZKShao



  • Members
  • Pip
  • 1 posts

Posted 15 January 2020 - 10:52 AM

We have the following stream setup:
main > staging > live

Where development takes place in main, features that are ready to deployed are integrated into staging and builds are created from staging and live. We're only started using multiple streams setup recently so right now the files in staging and live are identical to main, but I would like to remove certain files from staging in a way so that they can be re-integrated from main later on.

The use case is that in initially integrating all of main's contents downstream, we have also integrated some work-in-progress files and wish to undo that. Rather, on future integration we want those files to show up again. Is this possible?

#2 Sambwise


    Advanced Member

  • Members
  • PipPipPip
  • 1037 posts

Posted 02 February 2020 - 06:30 AM

If you use the “p4 undo” command to undo the integration and combine it with the “dm.integ.undo” configurable (this is an undoc setting that negates integration credit for undone integrations, designed with this exact use case in mind) you should be able to do this.

Another option, if you want to remove the files altogether and then restore them later like nothing happened, would be to exclude them from the stream's Paths (add "exclude" lines).  The files will still be in the depot but they'll be removed from workspaces of that stream.  When you remove the exclusions, the files will be mapped back in.

0 user(s) are reading this topic

0 members, 0 guests, 0 anonymous users