[p4] Integrate just one change - Stephen Vance - com.perforce.perforce-user

6 messages in com.perforce.perforce-user[p4] Integrate just one change

From	Sent On	Attachments
davi...@redspark.com	17 Jul 2001 17:25
Russell C. Jackson	30 Jul 2001 21:24
Stephen Vance	31 Jul 2001 06:04
Christopher Chong	31 Jul 2001 09:07
davi...@redspark.com	31 Jul 2001 09:55
Stephen Vance	01 Aug 2001 17:25

Subject:	[p4] Integrate just one change
From:	Stephen Vance (ste...@vance.com)
Date:	08/01/2001 05:25:38 PM
List:	com.perforce.perforce-user

Chris --

Integrating either using a branch spec and without specifying a source, or by any means that specifies a source without specific versions or with #head will produce the results you discuss, which is the same as the default behavior of the ClearCase findmerge command. Specifying a single revision attached to the file name as the source (e.g. "foo.c#3") will integrate everything up to and including that version/changelist. Only when you integrate using a version range (e.g. "foo.c#3,#4") will only the specific deltas be applied. There are equivalent behaviors to each of the above possibilities in all high end SCM systems, including ClearCase.

It just happens that Perforce makes it easy to do all of them from the command line, not just the most common one. ;-)

Steve

At 09:07 AM 7/31/2001 -0700, Christopher Chong wrote:

I agree. When I first started using Perforce I did some integrations by changelist only b/c I thought it would work like Clearcase and bring all the previous changes along for the ride. Nope. As Stephen said, it only takes the deltas of that version. So if the user changed foo.c#2 in change 1000 and foo.c#3 in change 1001, then integrated @1001, at 1001, you'll only get the deltas between 1000 and 1001. In Clearcase, if you integrated the head version, it would automatically take all the changes from the "root" version.

We use developer branches and integrate on approval instead...

--Chris