Perforce p4v Merge/Integrate freeze after file rename
I'm having trouble performing a merge/integrate from branch1/sql/ to b2/sql
I performed a rename operation in p4v from _1.sql to _2.sql
Made a small change to _2 file
Submitted changes
Went to submitted changes, and tried to perform a merge/integrate on _2 to the other branch (b2/sql).
The problem is that p4v freezes at that point:
What am I doing wrong ?
BTW, I have the latest version: Version: Helix P4V/NTX64/2018.2/1666551
Based on the generated changelist description, P4V appears to be hopelessly confused and trying to integrate the file into itself rather than between the two different branches you specified.
Easiest fix is to run it from the command line:
p4 merge //depot/Engineering/INT-DEV/...@=CHANGE //depot/Engineering/projects/...
where CHANGE is the small change you're trying to merge (this is easier/safer than specifying the full file path, especially if you're dealing with a file that got renamed in one branch but not the other since it's otherwise easy to mess up entering one of the paths).
If the small change is the only change you've made since the last merge, you can just trust p4 to figure that out automatically and do this very simple command instead:
p4 merge //depot/Engineering/INT-DEV/... //depot/Engineering/projects/...
- How do I undo several change lists in Perforce relating to the same files without submitting each one?
- Perforce: Integrating multiple changelists which contain same files with different revisions to branch
- Perforce has a phantom file due to a failed "p4 duplicate" command. I cannot submit this file anymore
- How do I retrieve the cloud key of my Digital Ocean Perforce Helix Core droplet?
- Just check if any output is coming after running "p4 sync -n", and not wait for the whole output
- Adding Git repository to Perforce depot
- Is there a way to create a Perforce Shelve CL that changes the directory to a symbolic link?
- How can I list P4 changes since a specific changelist
- limit "p4 changes" to `before date`, `user group` and `path`
- Perfoce .p4ignore isnt ignoring Save3 folder
- Perforce auto resolve from the command line?
- p4python: perforce: file is not under permissible file system path
- git p4 submit fails
- P4 edit doesn't 'edit' the file
- Deleting Perforce depot from AWS EC2 server does not free up space on EC2
- Perforce: Can I put a 'watch' on a file, so that I am notified when the file changes?
- How to check if file is added or in edit mode/checked out?
- How can I disable Perforce aliases?
- How to configure the perforce workspace to show modified files without checking them out
- Perforce changing the default editor
- P4: How can I submit a shelf?
- Equivalent of svn's blame for Perforce
- How can I replace one binary file with another in a single Perforce changelist?
- How to add a long list of files to a changelist in Perforce using python's subprocess module and the Helix Core API?
- Best way to sync latest files to pending changelist with outdated files using p4 cli
- P4 - change workspace for client
- How to delete a workspace in Perforce (using p4v)?
- How do I move a Perforce "workspace" folder?
- Looking for a way to get the details from revision graph via api in Perforce
- Deleting files from Perforce depot after being added to p4ignore