perforce

git-p4 submit fails with patch does not apply

梦想与她 提交于 2019-11-30 04:19:38
问题 When I do the following: $ git-p4 submit I wind up with the following error trace: error: patch failed: foo/bar/blah.h:1 error: foo/bar/blah.h: patch does not apply Unfortunately applying the change failed! What do you want to do? [s]kip this patch / [a]pply the patch forcibly and with .rej files / [w]rite the patch to a file (patch.txt) How can I recover from this situation and make a successful submission? FWIW, our P4 server is configured to use keyword expansion (filetype = text+k) and

How do I move a Perforce “workspace” folder?

耗尽温柔 提交于 2019-11-30 04:11:18
I've just downloaded a 4.5GB depot to a location on my hard drive that is not ideal. I'd like to move the folder that Perforce now sees as the "workspace" folder (iPhone) to another folder on my hard disk (Project Name), and then use that folder as the workspace folder. Is this possible, or do I need to download the entire depot again? Thanks, Dave Ofir Attal in the P4V application: Open the Workspace dialog: Go to Connection>Edit Current Workspace... change "Workspace root:" to where you like If you have not already moved the files, P4V will offer to copy them for you. As long as you know

Same file in multiple changelists in perforce

泄露秘密 提交于 2019-11-30 01:37:29
问题 Is there any way to have the same file be a part of multiples changelists in perforce? With that I mean that from the set of changed lines in the file one subset will belong to a changelist, while the other subset will belong to a second changelist. Bonus question: If perforce does not support this, then which Source Control Systems, if any, do? 回答1: To answer the bonus question: GIT allows for per-line changelists. For a comparison between the two view this question: GIT vs. Perforce- Two

GIT vs. Perforce- Two VCS will enter… one will leave [closed]

ぃ、小莉子 提交于 2019-11-29 19:02:32
So I'm in the process of getting GIT sold at work. First thing I need is to convince everyone that GIT is better at what they're already used to doing. We currently use Perforce. Anybody else go through a similar sale? Any good links/advice? One of the big wins is that we can work with it disconnected from the network. Another win IMO is the way adds/checkouts are handled. More points are welcome! Also we have about 10-20 devs total. The Perl 5 interpreter source code is currently going through the throes of converting from Perforce to git. Maybe Sam Vilain’s git-p4raw importer is of interest.

What is the difference between “Rollback…” and “Back Out Submitted Changelist #####” in Perforce P4V

为君一笑 提交于 2019-11-29 18:46:15
I want to reverse the changes from one of my checkins. In the right-click context menu of the particular changelist, there are these two options: Rollback... Back Out Submitted Changelist What is the difference between these two? In what situations should I use either one? Both of these operations restore a set of files to a previous state and are essentially faster, safer ways of undoing mistakes than using the p4 obliterate command (and you don't need admin access to use them). In the case of "Rollback...", this could be any number of files, even an entire depot. You can tell it to rollback

Setting Perforce line endings

删除回忆录丶 提交于 2019-11-29 11:02:57
I'm using perforce to manage some code. I have a workspace set up on my local machine and on the unix box. However recently perforce started adding ^M characters to end of the lines which caused issue when running the code in the unix env. How can I set my perforce locally not to do this when editing files. I'm using Notepad++ to edit locally I'd recommend using Unix line-endings for both clients. Unix line endings, despite the name, will tell the perforce client not to modify the line-endings when files are synced from how it is submitted originally. With this set on both clients, if you

Perforce Checkout Macro for XCode4

自作多情 提交于 2019-11-29 04:39:39
I'd like to setup a macro in XCode 4 to checkout the current file from Perforce. How can I do this? I do not have perforce integrated with my project and do not wish to do so. This is pretty easy in Visual Studio but I don't know the XCode equivalent. Incarniac The nearest I can think of is a service, so it looks like Xcode 4 Perforce Services could do the job. I haven't tried it personally, though. I stumbled across it in this question . Just came across this at Perforce.com as their means of making this work. I tried it, and it's pretty good. http://answers.perforce.com/articles/KB/2997 As

How do I move a Perforce “workspace” folder?

纵饮孤独 提交于 2019-11-29 02:03:30
问题 I've just downloaded a 4.5GB depot to a location on my hard drive that is not ideal. I'd like to move the folder that Perforce now sees as the "workspace" folder (iPhone) to another folder on my hard disk (Project Name), and then use that folder as the workspace folder. Is this possible, or do I need to download the entire depot again? Thanks, Dave 回答1: in the P4V application: Open the Workspace dialog: Go to Connection>Edit Current Workspace... change "Workspace root:" to where you like If

How to list all the files changed by a perforce change list

醉酒当歌 提交于 2019-11-28 21:08:18
I have a specific change list, and from the command line I want to list all files that were a part of that change list. How do I do this? Mike O'Connor That's the describe command. To describe a particular changelist, you want p4 describe <changelist number> . Update: If you only want the file names, you can use the files command with the -F option to override the output format: p4 -Ztag -F "%depotFile%" files @=<changelist> See http://www.perforce.com/blog/130826/fun-formatting for more information about the -F option. Day user114245 gave the best answer, but only in a comment. I'm adding as

Is Git recommended for large (>250GB) content repositories

感情迁移 提交于 2019-11-28 19:13:27
The web-application is a custom-built CMS which has several sub-applications and each one of them has code and content residing in the same directory structure. Due to the application framework's architecture the code and content are intertwined (content depends upon the code for its display and other functionalities) and hence are inseparable. The contents are not stored as BLOB rather they are stored as files and the underlying DB is used to link them. Size of sub-applications ranges from 20GB - 250GB and more (this is the killer). The web-application will go for some enhancements in code