[p4] obliterate and branching

Craig James Craig.James at thq.com
Wed Oct 3 17:31:45 PDT 2007


Hi there,

We're doing a project that involves a fair degree of branching and integrations over code and large amounts of binary files (totalling around 20GB in each intergrate).

To stop our perforce database space exploding I've been selectively obliterating file versions in the binary content - as we are really only interested in keeping the head revisions of many of those files (but want to keep the lazy copies so we don't need the extra copy in perforce).

Unfortunately we've just hit this bug noted in this Feb post http://maillist.perforce.com/pipermail/perforce-user/2007-February/020940.html

Meaning that when we want to integrate a new file version it brings up an error like this:
    Operation: user-resolve
    Operation 'user-resolve' failed.
    //FL07/Main/GCGame/Content/Debug/Debug.upk is missing from the rev table!

Our server info is:
Server date: 2007/10/04 09:52:40 +1000 E. Australia Standard Time
Server version: P4D/NTX86/2007.2/131374 (2007/08/09)

Our current workaround is to open the file for edit in the branch, copy over the new file and check it back in - but this adds a new copy of the same file and exacerbates the space issues on the server.

My questions are:

* Has the bug mentioned in the post above been addressed yet / planned soon?  

* Alternatively, is there another workaround that can effectively disconnect a file from it's merge history - allowing a new integration to proceed without error?


Regards,
Cj


More information about the perforce-user mailing list