headers
Jayaprakasam, Kannan | 1 Feb 2012 12:48

[p4] Force integrate not overwriting file

Hi

I'm trying to merge from mainline onto a branch, and I specified the -f
force option so that the files in mainline overwrite those in branch:

p4 integrate -i -Ds -Di -Dt -f
//Mercury/ML/platform/frameworks/cpp/frameworks_cpp/... <at> 553724
//Mercury/pvt/connection_rename/platform/frameworks/cpp/frameworks_cpp/.
..

but it did not overwrite the files on the branch. Please explain what is
going wrong here?

Thanks,

Kannan

_______________________________________________
perforce-user mailing list  -  perforce-user <at> perforce.com
http://maillist.perforce.com/mailman/listinfo/perforce-user
Permalink | Reply | 9 comments |
headers
Michael Mirman | 1 Feb 2012 14:11
Picon
Favicon

Re: [p4] Force integrate not overwriting file

Typically, you have to run "p4 resolve" to see the changes in your workspace.

--
Michael Mirman
MathWorks, Inc.
508-647-7555

> -----Original Message-----
> From: perforce-user-bounces <at> perforce.com [mailto:perforce-user-
> bounces <at> perforce.com] On Behalf Of Jayaprakasam, Kannan
> Sent: Wednesday, February 01, 2012 6:48 AM
> To: perforce-user <at> perforce.com
> Subject: [p4] Force integrate not overwriting file
> 
> Hi
> 
> I'm trying to merge from mainline onto a branch, and I specified the -f
> force option so that the files in mainline overwrite those in branch:
> 
> p4 integrate -i -Ds -Di -Dt -f
> //Mercury/ML/platform/frameworks/cpp/frameworks_cpp/... <at> 553724
> //Mercury/pvt/connection_rename/platform/frameworks/cpp/frameworks
> _cpp/.
> ..
> 
> 
> 
> but it did not overwrite the files on the branch. Please explain what is
> going wrong here?
>
(Continue reading)

Permalink | Reply | 2 comments |
headers
Jayaprakasam, Kannan | 1 Feb 2012 16:34

Re: [p4] Force integrate not overwriting file

Yes, I did use p4 resolve -am after doing the integrate, and there were
no conflicts. But the file in mainline was simply not copied to the
branch. This seems to be happening in many different places and
therefore causing a big headache. Please help.

Thanks,
Kannan

-----Original Message-----
From: Michael Mirman [mailto:Michael.Mirman <at> mathworks.com] 
Sent: Wednesday, February 01, 2012 6:42 PM
To: Jayaprakasam, Kannan; perforce-user <at> perforce.com
Subject: RE: Force integrate not overwriting file

Typically, you have to run "p4 resolve" to see the changes in your
workspace.

--
Michael Mirman
MathWorks, Inc.
508-647-7555

> -----Original Message-----
> From: perforce-user-bounces <at> perforce.com [mailto:perforce-user- 
> bounces <at> perforce.com] On Behalf Of Jayaprakasam, Kannan
> Sent: Wednesday, February 01, 2012 6:48 AM
> To: perforce-user <at> perforce.com
> Subject: [p4] Force integrate not overwriting file
> 
> Hi
(Continue reading)

Permalink | Reply | 1 comment |
headers
Kjellén Lennart | 1 Feb 2012 17:12

Re: [p4] Force integrate not overwriting file

The -am flag means automatic merge mode. If you want all source versions to overwrite the target versions
the resolve flag would be -at (their). 

                      Lennart Kjellen

-----Ursprungligt meddelande-----
Från: perforce-user-bounces <at> perforce.com [mailto:perforce-user-bounces <at> perforce.com] För
Jayaprakasam, Kannan
Skickat: den 1 februari 2012 16:35
Till: Michael Mirman; perforce-user <at> perforce.com
Ämne: Re: [p4] Force integrate not overwriting file

Yes, I did use p4 resolve -am after doing the integrate, and there were
no conflicts. But the file in mainline was simply not copied to the
branch. This seems to be happening in many different places and
therefore causing a big headache. Please help.

Thanks,
Kannan

-----Original Message-----
From: Michael Mirman [mailto:Michael.Mirman <at> mathworks.com] 
Sent: Wednesday, February 01, 2012 6:42 PM
To: Jayaprakasam, Kannan; perforce-user <at> perforce.com
Subject: RE: Force integrate not overwriting file

Typically, you have to run "p4 resolve" to see the changes in your
workspace.

--
(Continue reading)

Permalink | Reply | 0 comments |
headers
Jayaprakasam, Kannan | 1 Feb 2012 18:55

Re: [p4] Force integrate not overwriting file

I came to know that the private branch had been incorrectly created, by
adding files from scratch, instead of doing an integrate from mainline
to create it. As a result, I think perforce will not know the base
version common to mainline and private branch, so it behaves as though
the RHS (branch file) changes are to be retained instead of reporting a
conflict when the same line had been changed.
Someone's mistake is affecting me now.

Thanks
Kannan

-----Original Message-----
From: perforce-user-bounces <at> perforce.com
[mailto:perforce-user-bounces <at> perforce.com] On Behalf Of Jayaprakasam,
Kannan
Sent: Wednesday, February 01, 2012 9:05 PM
To: Michael Mirman; perforce-user <at> perforce.com
Subject: Re: [p4] Force integrate not overwriting file

Yes, I did use p4 resolve -am after doing the integrate, and there were
no conflicts. But the file in mainline was simply not copied to the
branch. This seems to be happening in many different places and
therefore causing a big headache. Please help.

Thanks,
Kannan

-----Original Message-----
From: Michael Mirman [mailto:Michael.Mirman <at> mathworks.com]
Sent: Wednesday, February 01, 2012 6:42 PM
(Continue reading)

Permalink | Reply | 0 comments |
headers
Jayaprakasam, Kannan | 1 Feb 2012 19:23

Re: [p4] Force integrate not overwriting file


 Is it possible to explicitly specify a base version to use when doing
the integrate?

Thanks,
Kannan

-----Original Message-----
From: perforce-user-bounces <at> perforce.com
[mailto:perforce-user-bounces <at> perforce.com] On Behalf Of Jayaprakasam,
Kannan
Sent: Wednesday, February 01, 2012 11:26 PM
To: Michael Mirman; perforce-user <at> perforce.com
Subject: Re: [p4] Force integrate not overwriting file

I came to know that the private branch had been incorrectly created, by
adding files from scratch, instead of doing an integrate from mainline
to create it. As a result, I think perforce will not know the base
version common to mainline and private branch, so it behaves as though
the RHS (branch file) changes are to be retained instead of reporting a
conflict when the same line had been changed.
Someone's mistake is affecting me now.

Thanks
Kannan

-----Original Message-----
From: perforce-user-bounces <at> perforce.com
[mailto:perforce-user-bounces <at> perforce.com] On Behalf Of Jayaprakasam,
Kannan
(Continue reading)

Permalink | Reply | 4 comments |
headers
Michael Mirman | 1 Feb 2012 19:37
Picon
Favicon

Re: [p4] Force integrate not overwriting file

If you don't have the base, you need to use the -I flag, which allows baseless integration.
I don't think you can declare an arbitrary revision as a base. That would be strange.

--
Michael Mirman
MathWorks, Inc.
508-647-7555

> -----Original Message-----
> From: Jayaprakasam, Kannan [mailto:kjayaprakasam <at> informatica.com]
> Sent: Wednesday, February 01, 2012 1:23 PM
> To: Jayaprakasam, Kannan; Michael Mirman; perforce-user <at> perforce.com
> Subject: RE: [p4] Force integrate not overwriting file
> 
> 
>  Is it possible to explicitly specify a base version to use when doing
> the integrate?
> 
> Thanks,
> Kannan
> 
> -----Original Message-----
> From: perforce-user-bounces <at> perforce.com
> [mailto:perforce-user-bounces <at> perforce.com] On Behalf Of Jayaprakasam,
> Kannan
> Sent: Wednesday, February 01, 2012 11:26 PM
> To: Michael Mirman; perforce-user <at> perforce.com
> Subject: Re: [p4] Force integrate not overwriting file
> 
> I came to know that the private branch had been incorrectly created, by
(Continue reading)

Permalink | Reply | 3 comments |
headers
Jayaprakasam, Kannan | 1 Feb 2012 19:50

Re: [p4] Force integrate not overwriting file

In a baseless integration, would it report conflicts if the same line
has been changed? Right now in many places it simply takes the changes
on the branch as the latest, ignoring the developments on the mainline.
Although in some other places, conflicts are reported too (don't know
how).

Thanks,
Kannan

-----Original Message-----
From: Michael Mirman [mailto:Michael.Mirman <at> mathworks.com] 
Sent: Thursday, February 02, 2012 12:07 AM
To: Jayaprakasam, Kannan; perforce-user <at> perforce.com
Subject: RE: [p4] Force integrate not overwriting file

If you don't have the base, you need to use the -I flag, which allows
baseless integration.
I don't think you can declare an arbitrary revision as a base. That
would be strange.

--
Michael Mirman
MathWorks, Inc.
508-647-7555

> -----Original Message-----
> From: Jayaprakasam, Kannan [mailto:kjayaprakasam <at> informatica.com]
> Sent: Wednesday, February 01, 2012 1:23 PM
> To: Jayaprakasam, Kannan; Michael Mirman; perforce-user <at> perforce.com
> Subject: RE: [p4] Force integrate not overwriting file
(Continue reading)

Permalink | Reply | 2 comments |
headers
Michael Mirman | 1 Feb 2012 20:10
Picon
Favicon

Re: [p4] Force integrate not overwriting file


> In a baseless integration, would it report conflicts if the same line
> has been changed? Right now in many places it simply takes the changes
> on the branch as the latest, ignoring the developments on the mainline.
> Although in some other places, conflicts are reported too (don't know
> how).

I believe it will report conflicts if the same line is changed, but I am not speaking from personal experience.

--
Michael Mirman
MathWorks, Inc.
508-647-7555

_______________________________________________
perforce-user mailing list  -  perforce-user <at> perforce.com
http://maillist.perforce.com/mailman/listinfo/perforce-user
Permalink | Reply | 1 comment |
headers
Jimil Borillo | 2 Feb 2012 03:10
Favicon

Re: [p4] Cloning PC&#39;s and default client root folder


Posted on behalf of forum user 'Jimil Borillo'.

Thanks for the replies guys.

I was hoping that I could get away with a simple "p4 flush" but I
guess, I'll work with your suggestions.

Cheers!

Jimil

--
Please click here to see the post in its original format:
  http://forums.perforce.com/index.php?/topic/1376-cloning-pcs-and-default-client-root-folder
_______________________________________________
perforce-user mailing list  -  perforce-user <at> perforce.com
http://maillist.perforce.com/mailman/listinfo/perforce-user
Permalink | Reply | 0 comments |

Gmane