[p4] A brief explanation of the differences between branchspec and filespec? - Matt Harp - com.perforce.perforce-user

8 messages in com.perforce.perforce-user[p4] A brief explanation of the diffe...

From	Sent On	Attachments
abe...@pandora.intra.kyocera-wireless.com	28 Dec 2001 12:28
Stephen Vance	31 Dec 2001 10:16
Matt Harp	04 Jan 2002 07:34
Rick Macdonald	04 Jan 2002 08:16
Stephen Vance	04 Jan 2002 13:49
Jeff Cyr	17 Jan 2002 07:10
Paul Cody	17 Jan 2002 07:19
Rich Ireland	17 Jan 2002 07:22

Subject:	[p4] A brief explanation of the differences between branchspec and filespec?
From:	Matt Harp (mha...@seapine.com)
Date:	01/04/2002 07:34:45 AM
List:	com.perforce.perforce-user

hey all,

I've been playing around with the branching in P4, and have been able to branch using both the Filespec method and the Branchspec method. What I don't understand is what the difference between the 2 is? They both seem work the same way, just that one uses a predefined mapping (the branchspec) and one operates on the fly. Is this the only difference, or are there subtler differences that I am missing?

Any help is greatly appreciated..

Thanks,

-----Original Message----- From: perf...@perforce.com [mailto:perforce-user-admin at perforce.com]On Behalf Of Stephen Vance Sent: Monday, December 31, 2001 1:16 PM To: abebal at pandora.intra.kyocera-wireless.com; perforce-user at perforce.com Subject: Re: [p4] Help

You told Perforce that the file had been deleted. It doesn't assume that there is any relationship between the old file and the new file just because you gave it the same name (and contents). Therefore, your merge is between two files with no historical relationship in Perforce's eyes.

The message you are getting indicates that you are probably using P4Win. If you go to the Options... button, you will find a checkbox entitled "Enable Baseless Merges". Check that box and it will let you go ahead. You likely want to do an "Accept Theirs" when you resolve unless you had some custom edits when you originally branched.

At 12:29 PM 12/28/2001 -0800, abebal at pandora.intra.kyocera-wireless.com wrote:

Created a branch using a branch specs, for eg //folderA/... //folderB/...

Now folderB is a branch of folderA, deleted a file from folderB and then recovered it by 1. Right Clicked on folderB and selected Show Deleted depot files 2. Right clicked the deleted file and sync it to "Date and time". 3. Added the file back to the folderB

Made some changes to this files and tried to integrate the changes to folderA, the problem is when i try to do this it say "Can't integrate the file in folderA from folderB. Please use the "Enable Baseless merged" option"

Can anyone please tell me what's wrong and why i am getting this message.

Thanks Arshad Bebal

Stephen Vance mailto:steve at vance.com http://www.vance.com/