1 message in com.perforce.perforce-user[p4] baseless integration history
FromSent OnAttachments
Sall...@symbian.com25 Feb 2003 02:05 
Subject:[p4] baseless integration history
From:Sall...@symbian.com (Sall@symbian.com)
Date:02/25/2003 02:05:11 AM
List:com.perforce.perforce-user

Hi

What is the easiest way to spot (action) when a user has enabled a baseless integration in the revision history of files. Or is it only when you go and try and do a "trace" that you come to a dead end this proves a baseless was used.

I've used the table below when working out what resolve options were used when tracking back integration histories. Is it already in this table below and I've just misunderstood the explanation.

====================================================================================== Integrate What the User Did During the p4 Resolve Process Action branch from file did not previously exist; it was created as a copy of partner-file. branch into partner-file did not previously exist; it was created as a copy of file. merge from file was integrated from partner-file, accepting merge.

merge into file was integrated into partner-file, accepting merge. copy from file was integrated from partner-file, accepting theirs. copy into file was integrated into partner-file, accepting theirs. ignored file was integrated from partner-file, accepting yours. ignored by file was integrated into partner-file, accepting yours. delete from file was integrated from partner-file, and partner-file had been previously deleted. delete into file was integrated into partner-file, and file had been previously deleted. edit into file was integrated into partner-file, and partner-file was reopened for edit before submission add into file was integrated into previously-nonexistent partner-file, and partner-file was reopened for add before submission

Sally Page Configuration Management Engineer Symbian (UK) Ltd Direct: 020 7563 2912 Mobile: 07769 588915

Visit Symbian at stand E31 in Hall 2 at the 3GSM World Congress, Cannes, France, 18-21 February 2003 www.3gsmworldcongress.com