CODEWITHSUNDEEP
gitperforcegit-p4
Arii
Arii

Reputation: 411

Git P4 - git p4 remote and p4 disagree on some files

I have a project using Perforce, and I've grown tired of struggling with it, so I have a local git repository overlaying my P4 workspace that I track changes in. However, at some point two binaries were submitted to P4 and somehow git-p4 failed to pick them up properly, and now my git commit history and P4 changelist history don't agree on those files. git p4 rebase will succeed, but the files will then show up as modified in perforce, and then reverting the files in P4 will make them show up as modified in git, even though git p4 insists that it's up to date. Now, every time I want to run git p4 submit, I first have to go into P4, revert those two files, run the submit, and then git reset --hard p4/master every time. This is frustrating, but I don't know how to force my git repo back into sync with perforce without either re-cloning the whole thing or committing what git thinks the files are and possibly corrupting them somehow.

What is the best way to solve this?

Upvotes: 0

Views: 27

Answers (0)

Related Questions