Home/ Questions/Q 6046727
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-23T07:16:22+00:00

I have an auto integrate trigger set up that can integrate between about 15

  • 0

I have an auto integrate trigger set up that can integrate between about 15 branches, all within the same product. My depot is set up like

//Product/dev/main/...
//Product/dev/v1.0/...
//Product/releases/v1.0.0/...
//Product/releases/v1.1.0/...

etc. That is easy enough to integrate between. My trigger does a search and replace on these depot paths to integrate from one to the other. It gets these paths via subtasks in Jira. Now other projects want the same thing. The problem is not all projects follow the same structure. Some are more like

//ProductB/SubProject/dev/main/...
//ProductB/SubProject/dev/v1.0/...
//ProductB/releases/v1.0.0/...
//ProductB/releases/v1.1.0/...

So I can’t use the same search and replace method, because it may be different between projects. I was hoping someone might have a integrate trick I could use. Branchspecs don’t appeal to me because we have over 18 products, with some products having over 15 branches. So if I create a new branch for a product, I have to create 16 branchspecs. Doable, but painful.

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    If I understand correctly, all //productB branches have a common ancestor, right?
    I think you could programmatically call p4 filelog -i and parse the output to see where it belongs to.

    The -i flag includes inherited file history. If a file was created by
    branching (using ‘p4 integrate’), filelog lists the revisions of the
    file’s ancestors up to the branch points that led to the specified
    revision. File history inherited by renaming (using ‘p4 move’) is
    always displayed regardless of whether -i is specified.

    • 0