Jump to content


Member Since 20 Feb 2019
Offline Last Active Jan 09 2020 12:36 PM

Posts I've Made

In Topic: tampered warning on resolve

27 September 2019 - 09:51 AM

Again some question about "tampered warning on resolve"...
Because the common Base was quite old and p4merge 4 window-view was too complex, we just edit the file in some external diff editor. p4 resolve -am was failing because P4 detected the tampered file. Ok.
What is the right way to submit that file as integrated? p4 edit, then p4 resolve again? Or would 'p4 edit' submit a simple edited file and forget about the integration?

In Topic: Move and integrations

03 April 2019 - 09:30 AM

We don't use streams yet. In your blog you start with the old workaround of branch specs, then move over to using streams. So is this only possible with streams? I mean when 2 branches have different directory trees after one of them has moved stuff, and some magic branch spec is updated in the background in order to keep the files on different directories mapped when integrating between the 2 branches?