[p4] integrating into branchspec

[Russell Jackson]

You can edit an older revision of a file, but Perforce will not let you
submit it until you resolve it against the head revision. You can even
integrate into an older version of a file on a branch, but you will have do
two resolves on the file in that case. One resolve into the old revision of
the file, and then a resolve of that merge with the head revision of the
file.

Rusty

On 3/20/07, David Weintraub <qazwart at gmail.com> wrote:
>
> Just want to get this straight: You have a client where you have files
> that are not at the head revisions on their branch, and you are taking
> files from a branch and merging these changes into your client as
> configured. Is this correct?
>
> If this is correct, then I suspect that Perforce is doing exactly what
> a good revision control system should be doing: Refusing to allow one
> to make changes in a revision of a file that is not located at the
> head of a branch.
>
> There is a work around. First create a new branch based upon the files
> you have in your client. Then set the client to see the latest on the
> new branch. The files should be identical with the revisions you
> originally selected. The difference is that these revisions of these
> files are on the head of the branch. Now, you should be able to do the
> integration without any problems since you are now integrating to the
> head revisions of the branch.
>
> This is not a Perforce issue, but would be true in all revision
> control systems. You should not be able to change a revision of a file
> located in the middle of a branch and be able to check it back in. I
> believe in Perforce, you can't even do a "p4 edit" on the file until
> you sync it to the end of a branch.
>
> On 3/20/07, Ramdas.Hegde at seagate.com <Ramdas.Hegde at seagate.com> wrote:
> > I did not see this message being posted in the mailing list... hence
> > sending it again... excuse me if you are receiving this message twice...
> >
> >
> > I am attempting to integrate in my client workspace into a branchspec.
> My
> > client workspace has been sync'd not to the head version but has files
> from
> > various different erlier revisions. My goal is to be able to sync up my
> > current client workspace to the new branchspec that i created. But when
> i
> > attempt to do that thru the "integrate" command, P4 integrates in the
> > latest head revision instead of what is there on my client workspace.
> How
> > can i achieve what i am attempting to do?
> >
> > Thanks
> >
> > Ramdas
> > _______________________________________________
> > perforce-user mailing list  -  perforce-user at perforce.com
> > http://maillist.perforce.com/mailman/listinfo/perforce-user
> >
>
>
> --
> --
> David Weintraub
> qazwart at gmail.com
> _______________________________________________
> perforce-user mailing list  -  perforce-user at perforce.com
> http://maillist.perforce.com/mailman/listinfo/perforce-user
>



-- 
--------------------------------------------------
RCJackson Consulting
Perforce Consulting Partner and Certified Trainer
--------------------------------------------------
rusty at rcjacksonconsulting.com
http://www.rcjacksonconsulting.com
tel: 512-535-7274
fax: 512-535-7322
--------------------------------------------------