1 reply to this topic

[wdstest]

Hello All,

We are a small 3-person shop using free perforce on windows, a few months back we hired a consultant to do some programming work for us (he also uses perforce on his own windows server without overlap with ours). The consultant sent us his work, before going on holiday.
Depot (folder)
Chekpoint.1234
Checkpoint.1234.md5

He said to merge his repository into our existing repository.
While I know how to backup and restore our own depot as a whole, since the document is very clear on that. I was even able to restore the consultant’s stuff into its own depot on a new server independently. But how do I consolidate the above into our own existing Depot? Is there some special documentation or unique tools for this?

I am new at doing this so maybe I didn’t understand or misread a section of the help documents. Any help is appreciated. Thank you.

[Sambwise]

Historically the tool for this has been Perfmerge: https://community.pe.../s/article/2594

I think in the modern era you can probably just do this by setting up one server as a remote of the other and using either "p4 fetch" or "p4 push" to move changes from one to the other.

https://www.perforce...nd_pushing.html