[p4] integrating into branchspec
David Weintraub
qazwart at gmail.com
Tue Mar 20 11:59:28 PST 2007
Take a look at the built-in help for the following two commands:
$ p4 help integrate
$ p4 help revisions
I am using the third format for the "p4 integrate" command. This
allows me to specify the revision of the file you want to integrate
via the "-s" parameter. If you take a look at "p4 help revisions", it
will explain all the different ways you can specify a particular
revision. The "#have" is a special revision number that simply means
currently have in my client.
However, as Robert Cowham points out, you could also use the "-h"
parameter in the "p4 integrate" command which does the integration
with the currently have revisions of the files on your client:
$ p4 integrate -h -b <branch>
instead of what I had:
$ p4 integrate -b <branch> -s //...#have
The first is a much simpler format. I also noticed that this is
directly supported by P4V under the Additional Options (Do not get the
latest revision of selected files (-h)).
On 3/20/07, Ramdas.Hegde at seagate.com <Ramdas.Hegde at seagate.com> wrote:
> Dave,
>
> Thanks for your responses.
> Your interpretation in this email is correct... i have a new branchspec and
> i want to copy into this branch the current view of the files from my
> client.
> This is my first attempt at creating branches and stuff like this in P4 so
> do not understand all its details...when you say " -s //...#have" what is
> "#have" and from where on my client should i be issuing this command.
> For example if i need to upload all the files under c:\test_files\src to
> //depot/branches/test where test is the new branchspec that i just created,
> what would the integrate command look like?
>
> Thanks again,
>
> ramdas
>
>
>
> "David Weintraub"
> <qazwart at gmail.co
> m> To
> No Phone Info "Ramdas.Hegde at seagate.com"
> Available <Ramdas.Hegde at seagate.com>
> cc
> perforce-user at perforce.com
> 03/20/2007 11:41 Subject
> AM Re: [p4] integrating into
> branchspec
>
>
>
>
>
>
>
>
>
>
> There is another way to interpret what you are saying...
>
> You created a new branchspec, and you want to copy into this branch
> the current view of the files in your client. In that case, it's a lot
> easier:
>
> $ p4 integrate -b branchspec -s //...#have
>
> This will copy over the revisions you currently have on your client
> into the new 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
>
>
>
--
--
David Weintraub
qazwart at gmail.com
More information about the perforce-user
mailing list