Stack Overflow
Stack Overflow

Questions tagged [perforce-integrate]

A process of merging or overwriting changes from one branch to another

When you've made changes to a file that need to be propagated to another file, start the process with p4 integrate.

The simplest form of this command is p4 integrate fromFile toFile this lets the Perforce server know that changes in fromFile need to be propagated to toFile.

91 questions
15
votes
6 answers

Integrating moved files in perforce

Say I created a branch in perforce of our codebase. Here is the branch spec: //depot/code/main/... //depot/code/branch/... Then, in the branch, say I move the branched file a.txt -> b.txt using p4 integrate //depot/code/branch/a.txt…
SamBeran
  • 1,944
  • 2
  • 17
  • 24
13
votes
2 answers

Get a list of changelists that have not been integrated into a particular branch

If I have Branch A and Branch B. Branch B was branched from Branch A. Periodically, we integrate changes from Branch B back into Branch A. Is there a p4 command for listing the Branch B changelists that have not yet been integrated into Branch A?…
Karim
  • 18,347
  • 13
  • 61
  • 70
12
votes
2 answers

P4 merge error, No target file(s) in both client and branch view

First of all, I have a stream root named "//streams/main". Then, I created a sub stream named "//streams/branchA" whose parent is "//streams/main". and I always worked on my own stream - branch A Now, I want to do a down integration, from main to…
Orionpax
  • 993
  • 5
  • 13
  • 27
11
votes
2 answers

Perforce: Branch from a specific changelist perforce

How do you branch from a specific changelist in perforce? That is, if main is my main codeline, and I want to create a branch b off of main from a changelist n, what is the syntax to do this? I've tried: //depot/main/...@n //users/me/sandbox/... in…
DSaracino
  • 241
  • 2
  • 6
9
votes
2 answers

In perforce, how do I list source file of a pending integrate?

I have a pending changelist open with several integrated files. Is there a way to list where (perforce path and revision) these files were integrated from? I'd like to double check that they were integrate from the correct place before submitting.
Tolli
  • 362
  • 5
  • 12
6
votes
1 answer

Copy all changelist descriptions while merging in Perforce?

I am working with "my" Perforce branch, fixing some small issues in the code. Every now and then I am integrating with another branch ("main"). I write extensive changelist descriptions each time I commit to "my" branch. When I integrate, I would…
ynka
  • 1,457
  • 1
  • 11
  • 27
5
votes
3 answers

Add new folder to depot in P4V client

I want to create a private branch folder in a depot using perforce visual client. Can somebody tell me how to do it? I looked up on Google but there is so little help for a P4V user. Restating the question: I have created a local directory:…
Anand
  • 11,872
  • 10
  • 39
  • 51
4
votes
2 answers

Perforce : can I change the comment associated with a p4 integrate?

Is it possible to change the comment associated with a p4 integrate after I have done the integrate? The integrate itself is fine but the comment associated with it needs improving.
Adam Rose
  • 41
  • 2
4
votes
2 answers

Perforce integration with NetBeans

Which Netbeans plugin for Perforce-Netbeans integration is the most reliable?
Piotr Kochański
  • 21,862
  • 7
  • 70
  • 77
4
votes
2 answers

perforce sync no such files

I am trying to setup perforce. I installed p4v and setup workspace. Then I ran C:\"Program Files"\Perforce\p4 -p perforce-test:1500 -u test-user -c test-user_test sync //test-folder/test/ But I get error //test-folder/test/ no such files(s) I can…
user2661518
  • 2,677
  • 9
  • 42
  • 79
4
votes
2 answers

Proper way to ignore source files during Perforce integration

In my primary branch there is a change list with 10 files that I'm trying to integrate into a development branch. All of the outstanding files in the change list should be ignored, and not branched into the target. What are the steps to do the…
cmcginty
  • 113,384
  • 42
  • 163
  • 163
3
votes
3 answers

P4V: Automatically Integrating Changes Changelist-By-Changelist Using Branch Mapping

Using Perforce, I am trying to automate the integration from our dev branch to our main branch. I have branch mapping set up, and I know I can integrate changes automatically for the entire branch. I was wondering if there is a way to integrate…
Chris C.
  • 1,217
  • 2
  • 10
  • 6
3
votes
1 answer

P4 integrate of files that were moved and deleted

I'm trying to integrated about 30 changelists from my branch to parent branch and I need to cherry-pick only related CLs. There is a file File1 that was Updated, Renamed+Moved and Deleted. There are also files File2 - File10 that were added and…
Kalicz
  • 346
  • 3
  • 13
3
votes
1 answer

How to connect & perform Sync with Perforce on Mac

I am trying to access perforce and perform Sync operation from command line on Mac machine OS x 10.8.5 Can any one tell me how to access perforce for command line. I have placed p4 client in /usr/bin directory, From Terminal when i execute…
user3759870
  • 53
  • 2
  • 5
3
votes
2 answers

Error while integrating a deleted file in perforce

A parent project is throwing the following error when trying to integrate a child project. Exception: < FILE > - can't integrate (already opened for delete) Under what scenario does this occur?
crk
  • 617
  • 1
  • 8
  • 12
1
2 3 4 5 6 7