perforce - git p4 submit always tries to re-apply every patch -


we've moved git still have systems depend on same data being in perforce i'm mirroring our git repo on perforce follows:

  • git pull origin master
  • git p4 rebase
  • git p4 submit

but problem i'm seeing every time run submit after pull origin tries re-apply every commit, ones submitted results in self generated conflicts. what's interesting works:

git p4 submit <--- submit changes
git p4 submit <--- no changes submit, recognizes it's date

but throw in git pull origin master (even if there nothing new on origin) loses track , on next submit tries re-apply everything. example:

git p4 submit <--- no changes submit
git pull origin master <--- no activity on git server side no changes applied
git p4 submit <--- tries re-apply changes submitted earlier

is git pull origin master somehow wiping out git p4's notion of changes have been applied , haven't?

you still pointing @ root. check branches point right place. use gitk --all or git branch -a.


Comments

Popular posts from this blog

asp.net - repeatedly call AddImageUrl(url) to assemble pdf document -

java - Android recognize cell phone with keyboard or not? -

iphone - How would you achieve a LED Scrolling effect? -