Showing posts with label different. Show all posts
Showing posts with label different. Show all posts

Saturday, 18 December 2010

How do I check in a different branch than I check out from in perforce.

According to the Perforce Blog, the p4 move -f command will move your edit from one branch to the other. From the blog

This can be a real lifesaver if (as I did a few weeks ago) you start working on a fix in your mainline, and then decide that it needs to go into your release branch instead. Previously you would have needed to save a copy of your work, revert it, open the files in the release branch, and copy your edits back in manually — now you just “p4 move -f main/… rel/…” and all your edits go where you need them.

This is a new feature added in version 2010.1 (this year I believe) so that's probably why tech support didn't know about it.


View the original article here

Saturday, 6 November 2010

git-p4 sync on different branch and repo

I'm trying to mirror a perforce repository, and git-p4 performs well enough on the main branch. I simply have to call git-p4 rebase. I'm also trying to mirror a different branch, but that's not working out so easily. I thought I could just do a git-p4 rebase --branch=p4/whatever //open/branches/whatever but rebase appears to ignore those tags, and if I do a sync instead I get the error message: fast-import failed: warning: Not updating refs/heads/p4/whatever (new tip 14f7e14e5079bb730363440901adee102e5f04c9 does not contain 0ca89b0333f408367e3676720b109a08cc40b3ae)

My initial import was a sync with @all, why wouldn't it be able to update, or is there a different/better way to do this?


View the original article here