security,version-control,perforce,opengrok
https://github.com/OpenGrok/OpenGrok/issues/503 feel free to join debate there(or in similar requests), ev. send patches
If it's a task stream (which is what I'd recommend for a short-lived "feature branch" type stream), you probably want to "unload" it: p4 unload -s //depot/task_stream This is basically like deleting the stream with "p4 stream -d", except that you can get it back later if you want to....
Resolved. In the Azure Portal, created a new endpoint with public port 1666 and private port 1666. I guess it provides a mapping between external and internal IP addresses and ports. Thanks everybody.
If you right click on a folder in P4V, you can choose "Rollback..." and pick 100 as the changelist you want to roll back to. Then at the end of the day, you would repeat that process and pick 108. That should leave everything as it was at the beginning...
I'm not sure what your mapping looked like when you tried having it all in one workspace, but it sounds like you want: //depot/foo/trunk/... //my_client/trunk/foo/... //depot/foo1/trunk/... //my_client/trunk/foo1/... //depot/foo1/branch1/... //my_client/branch1/foo1/... which is a perfectly valid one-to-one mapping. This on the other hand would not work: //depot/foo/trunk/... //my_client/trunk/foo/... //depot/foo/trunk/... //my_client/branch1/foo/... //depot/foo1/trunk/... //my_client/trunk/foo1/......
git,migration,perforce,revision-history
The migration of the second part works fine when done into a new git repository That could be the basis of an acceptable workaround here: have to separate Git repo, and chose a technique from "How do you merge two git repositories?" to get one final repo. The git...
Thanks for the help everyone. The issue was that since the files were in two different streams instead of unshelve I needed to change ownership for the changelist to the new workspace. Now I can unshelve without any issues. To change ownership I right clicked the the changelist in P4V...
The permissions need to be set by a Perforce admin user unfortunately, using the p4 protect command.
It is possible, but I don't see any reasons or use case to do it as it is not a correct workflow and can be confusing. But if you decided to do it, the next steps are required: Example how to do it using Perforce source control. Steps inside job...
p4 filelog filename#`p4 fstat filename | tail -n2 | awk '{print $3}' | sed -n 1p` | sed -n 2p | awk '{print $4}' This helped me . It will directly return the version associated with the file p4 fstat filename | tail -n2 | awk '{print $3}' |...
You can set your alternate folder name as an AltRoot in your client spec. And there are other approaches. See this writeup for more details: http://answers.perforce.com/articles/KB_Article/Symbolic-Links-and-Workspace-Roots...
The error message is a Perforce authentication failure and suggests there's a problem with your AUTOMATION_USER_PASSWORD_TICKET. If that's actually a ticket (it should look like a hash rather than plaintext), the problem is most likely that it's expired -- by default a login ticket is only valid for 12 hours...
Eval-type solutions generally fail to be robust against arguments with odd characters in them. On the other hand, they are often unnecessary. Instead of /bin/sh -c "/usr/local/bin/p4 "[email protected]" $pager" which has a quotation error (the quotes around [email protected] are actually unquoting [email protected] although fixing that won't help since you would...
The empty changelist is no big deal; you can just delete it if you want. But, you might instead change your script slightly: just before you do the submit, do 'p4 revert -a results.txt'. That will revert results.txt, but only if it is unchanged. Only run the 'p4 submit' if...
You are probably looking for git ls-files This is not a complete analogue, since Perforce is so different from git, but it's my best guess. You can also choose from a number of flags to specify which files to inlcude in the list: --[cached|deleted|others|ignored|stage|unmerged|killed|modified] See git help ls-files for full...
jenkins,stream,continuous-integration,perforce
Try the p4 plugin, its an implementation using p4java and supports Streams. Either select 'Manual' workspace behaviour and provide a stream path, or use the 'Stream' workspace and Jenkins will create the workspace for you....
Removing permissions to them is the best option. Since you want them to remain accessible as a historical reference, but NOT permit new changes, you'll want to remove the "write" level of permission but leave the "read" level: write user * * -//depot/oldbranch/... read user * * //depot/oldbranch/... If only...
This worked > p4 -V Perforce - The Fast Software Configuration Management System. Copyright 1995-2014 Perforce Software. All rights reserved. This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) See 'p4 help legal' for full OpenSSL license information Version of OpenSSL Libraries: OpenSSL...
Thanks to a colleague I found the issue. On that specific machine, p4 was in /usr/local/bin but /usr/local/bin wasn't in my PATH. By moving p4 to /usr/bin I resolved the issue for both my OSX Agent and OSX Server.
You should gotten a change number when you did the p4 shelve. If you can't remember it, p4 opened will tell you. You need to re-open d.txt and give it that change number using p4 reopen -c <change#> d.txt. Then run p4 shelve -r to update the shelved files.
Have you tried the following steps under 'Pending integrations not reverted'? http://answers.perforce.com/articles/KB_Article/Reverting-Unchanged-Files Files that are integrated and resolved but have no content or type changes will still be submitted as new revisions, EVEN IF you have 'revertunchanged' selected in your client spec, or use 'submit -f revertunchanged'. This behavior is...
To see unresolved integrations, use p4 resolve -n ...
This is the doc page you need: http://www.perforce.com/perforce/doc.current/manuals/cmdref/envars.html In general, this should do the trick (with the current version of the command line client that supports "p4 set" on all platforms): p4 set P4USER=username p4 set P4CLIENT=clientname p4 login The "p4 login USERNAME" syntax is used when you've already logged...
client,perforce,specifications
Client specs, like other spec objects, can be archived in the Perforce "spec depot". Unfortunately, the spec depot is not enabled by default, so if you haven't already enabled it, you won't have the older versions of specs. Here's how to enable and use the spec depot: http://answers.perforce.com/articles/KB/2445/...
encoding,gradle,perforce,maven-publish
After diving into the Gradle API I came up with this: // Force character encoding in case the workspace was not set up correctly tasks.withType(Javadoc) { options.encoding = 'x-UTF-16LE-BOM' } This has resolved the issue on machines that were previously failing with encoding errors when running 'gradlew publish'. Note: For...
Note that you need at least a 2011.1 server to do this (if your server is older you'll get an error message on the integrate): p4 integrate -Rd //branch/[email protected],CL //main/... p4 resolve -ay The "-Rd" flag says that files which would normally be opened for delete automatically should be opened...
The formatting flag -d[formatting option] for p4 describe should help here. For example, p4 describe -dc1 [changelist] will give you a format like this: Change 2238074 by [email protected] on 2014/09/02 11:23:44 Change description Affected files ... ... //depot/path/file1.java#3 edit Differences ... ==== //depot/path/file1.java#3 (text) ==== *************** *** 8,11 **** credentials...
I am not sure if by 'repository', you mean a different directory on the same Perforce server, but if so, then follow the steps here: http://answers.perforce.com/articles/KB_Article/Renaming-Depot-Directories For 2009.1+ Perforce servers, use 'p4 move'. EXAMPLE p4 edit //Rep1/FolderAA/FileA p4 move //Rep1/FolderAA/FileA //Rep2/FolderAA/FileA p4 submit In P4V, you can select the source...
If you want to create a new file called "wug.cpp" that contains all of the others, leave a record of this in the metadata, and do it all in one changelist, you could do: p4 merge wug1.cpp wug.cpp p4 resolve (choose 'at', to branch the file) p4 merge wug2.cpp wug.cpp...
Here's how I clean things up when I accidentally associate a change with the wrong job: 'p4 fix -d -c <change> <wrongjob>' 'p4 fix -c <change> <rightjob>' That is, I delete the fix which related the change to the wrong job, and add the fix which relates the change to...
Files with a revision greater than one are not necessarily modified in a particular workspace. They could have been modified anywhere, then got submitted and thus have a new revision. If you still want a list of all files in your current workspace with rev > 1 do this: p4...
I had to create a new perforce workspace dedicated to Jenkins, mapped to the workspace folder. P4 now synchronizes the files correctly.
File locking is used to coordinate and serialize those submit commands that modify the same files in the repository. Your developer's submit failed because some other developer has those files locked. You can use 'p4 opened' to see which other developer has those files locked. Typically, the files were left...
The end marker of the here document must be left justified. for i in $( echo TEST-01); do p4 label -i << ENDOFLABEL Label: $i Options: unlocked Description: label from Automation View: //depot/... ENDOFLABEL done Or, if you use actual tabs for indentation, you can use a minus sign in...
cmd,sync,edit,perforce,workspace
It's not clear why you don't want to permanently change the client root on your system. If you just want to work on this one file (data_summary.csv), and you want to work on it in a different location on your workstation than your normal Perforce workspace, the simplest approach is...
It turned out that I needed to change the "Active Changelist" in Idea. Here are the steps: In Idea, open “Change Tool Window” by clicking on Menu “View” -> “Tool Windows” -> “Changes" Right click on the “Default” changelist(or any changelist you want to set to active/default) in the Tool...
They're almost always the same. They're only different in cases where you have explicitly synced to a revision other than the one that you are currently "working on". This is so that if you revert, your workspace will be consistent with what you explicitly synced to. Example: C:\test\999\depot\sam\i\rc\a>p4 edit foo...
If the file is opened for edit, and you have already run 'p4 sync', then you should have seen a message like: $ p4 sync //depot/main/b#2 - is opened and not being changed ... //depot/main/b - must resolve #2 before submitting What this means is that Perforce is ready for...
version-control,perforce,rebase
Follow the same "back out" steps, but this time back out change 2: sync to change 1 open sync to change 2 ignore sync subsequent changes merge The merge result will contain the changes from 1 on top of subsequent changes, and you're ready to submit....
You need to ensure you've included NAntContrib in your build script - this is what contains the p4set task. Within your project element in the script, use the loadtasks task to load NAntContrib: <project default="help"> <loadtasks assembly="d:\path\to\nantcontrib\NAnt.Contrib.Tasks.dll" /> ...
I never used Perforce Plugin and I don't know what these checkboxes do. But normally if you want to fix workspace's path you can use Configure->Advanced Project Options->Use custom workspace checkbox. As described in documentation it does what you need: Normally you should let Jenkins allocate and clean up workspace...
Yes. A good example of how -Di might be problematic is the case where File1 has been edited on the trunk and/or branch. Suppose that the old File1 contains "A", trunk/File1 is "AB", and branch/File2 is "AC". Suppose the new File1 is "D". branch/File1: D branch/File2: AC trunk/File1: AB If...
From the command line: p4 reopen -c CHANGE //depot/folder/... In P4V, select the files and do Actions > Move Files to Another Changelist....
One way to go about this is to organize all your .ts and their corresponding .js files into a subfolder, and use .gitignore to ignore .js files in that subfolder. For example, if we have a project layout that looks like: apps |-- *.js # many JS files |-- ts...
Thank you for specifying your server version. The 'p4 interchanges' command can give the "All revision(s) already integrated" message with misleading results when cherry-picking is involved. There is a command line example here: http://answers.perforce.com/articles/KB_Article/Cherry-Picking-Integrations You could also be affected by a bug that was patched in 2014.1 listed here in...
Perforce has forums where you can ask questions: forums.perforce.com At one time (depends on P4Java and server versions) incorrect order values could lose data. There's also a spaces-in-path problem. This works for me: peList.add(pe); // fix order values and spaces-in-path quoting int i = 0; for (IProtectionEntry pe : peList)...
teamcity,perforce,teamcity-9.0
I'm afraid, it looks like so far you cannot do this. The only solution is to create specific build configurations for different branches and use them for personal builds. Better support of feature branches based on Perforce streams is planned, and hopefully we'll include it to Teamcity 9.1 release, planned...
Simply go to ftp.perforce.com and download the p4 binary. Since you are on Mac OS X, you probably want the darwinx86_64 version. Put it in a folder that is in your path (echo $PATH) and you are ready to go....
A changelist collects a group of changes that belong together as a unit. Perforce still retains the history of each individual file, but it also tracks a set of related changes into a larger unit, called a changelist. A changelist is used to move you from one consistent state of...
There are several different concepts here. You can have a single workspace, or you can have multiple workspaces. Each workspace has its own root directory on your workstation, and its own copy of whatever files you have most recently sync'd. If you have a single workspace, you can switch that...
You can use a file as an argument with the -x global option flag, as Bryan mentioned in his comment. EXAMPLE - sync -- Notice the file contents of 'syncfile.txt' with three filenames, at specific revisions. $ cat syncfile.txt foo#1 bar#4 baz#3 -- The client workspace currently has all the...
I am a Git user trying to learn Perforce. I'm sorry. How can this be performed using Perforce? I'm a better Git user than I am a Perforce user, so correct me if anything appears wrong. I highly recommend reading the man pages and a tutorial. It "can't" be,...
Use the "force integration" flag: p4 integrate -f ../dev/... ../rel/... ...
If the folder you want to exclude is specific to your machine, setting P4IGNORE locally is the easiest way to exclude it from being added to the depot. http://www.perforce.com/blog/120214/new-20121-p4ignore You'd set P4IGNORE to some name like "p4ignore.txt", create a file with that name, and add "Libraries" to it -- subsequent...
p4 integrate $branch1\@$chglist1,\@chglist2 $branch2 > files.txt Make sure that $branch1 and $branch2 are paths that map all of the files in the branches, e.g. "//depot/main/..." and "//depot/dev/..." rather than "//depot/main" and "//depot/dev". If they are not provided to your script in that form, your script should append the necessary wildcards...
perforce,perforce-client-spec,perforce-integrate,perforce-branch-spec
Do you mean something like: C:\Users\Bryan>type foo.br Branch: foo Owner: Bryan Options: unlocked View: //depot/main/... //depot/bryan/... C:\Users\Bryan>type foo.br | p4 branch -i Branch foo saved. ...
Use the files subcommand: p4 files //depot/foo/bar/[email protected]/02/11,@now ...
perforce,code-review,code-collaborator
Yes, this is the normal workflow. You have already created a review using ccollab addchangelist new {your-cl} and Collaborator gave you a review number. Now that you have edited the files in {your-cl} use ccollab addchangelist {review-number} {your-cl} and the new versions will be uploaded to Collaborator....
I bet you just need to provide a filespec, try p4 revert -c <changelist> //...
If you want all of the files in the depot: p4 files //... If you want all of the files you have synced to your workspace: p4 have ...
If the file is recorded as "open" in Perforce (i.e. it is returned by the "p4 opened" command, or it appears in the "pending changes" tab in the GUI), even a force-sync won't overwrite it, because you're still working on it. If you want to discard your changes to get...
perforce,perforce-integrate,perforce-branch-spec
Apparently the process was correct and the optimization was not necessary. However it is important to note that when you are merging you can opt-out contents that haven't changed.
Since this is a pending changelist, and since it doesn't sound like you need to do this from a script, just do: p4 change 9 This will bring up the changelist form in an editor so you can edit it. Make the edits, save the file, then exit the editor....
python,git,bash,perforce,git-p4
I suspect the type of details["desc"] is byte string. (str for python2). Therefore you need to decode it to Unicode before you encode it. print type(details["desc"]) to find out the type. details["desc"].decode("iso-8859-1").encode("UTF-8") might help to convert from iso-8859-1 to UTF-8....
Apparently there is an implicit remote branch "p4" created. Thus, running git pull p4/HEAD will pull the latest changes from git p4 sync into your current branch. It can be listed by using git branch --remotes (thanks to @jamesdlin).
The basic idea is you do "p4 client -o" to get the current client spec, modify it, and then pass the modified version to "p4 client -i". p4 client -o | sed -e "s/LineEnd:.*/LineEnd: unix/" | p4 client -i Substitute your own value of LineEnd and/or your own sed replacement....
You didn't mention if you just need the head revisions or if you need full history, whether this is a one-time request or part of a regular process, whether both servers are under your control, etc. So some of this is speculation, but here's three possible ways: Create a workspace...
To "open" a changelist, run: p4 change CHANGENO This will give you the changelist formatted as a human-readable text file (a changelist specification). On the back end changelists are stored in a database, so there is not an editable text file on the back end that looks like this; running...
You need to "archive" your artifacts (what you called "outcome files"). It's a post-build action, called "Archive the Artifacts". Also, decide how many builds, with archives you want to keep. This is configured in the first "Advanced..." section of the job configuration. More about archiving here: Archive the artifacts in...
You are describing p4 annotate. By default it prints the file with each line preceded by the revision number that the line was last changed. With option -c you can have the lines preceded by the corresponding changelist. Call p4 help annotate for more details.
Unless the stream is a task stream, deleting the stream only deletes the stream specification, not the files that have been submitted to the stream. The files submitted to the stream are part of your permanent history; you want to keep them! I often find myself referring back to the...
security,login,perforce,ticket
Setting the ticket to never expire is what you're looking for -- you're correct that it does create a bit of a security risk in that someone who compromises your client machine while you're absent has easy access to the Perforce server. With the default 12-hour ticket this is of...
version-control,perforce,changelist
The same way you claimed ownership of this change in the first place -- run "p4 change change-number" and edit the Client field to point at someone else's client.
First you'll get the workspaces, and then you can run through the list of workspaces to get the owner. To get the workspaces you will need to loop over every workspace in your server and run(assuming your filename from the question): p4 files //root/folder/[email protected]<workspace name> If you get a 'no...
Here is solution I found: repository.Connection.TaggedOutputReceived += Connection_TaggedOutputReceived; static void Connection_TaggedOutputReceived(uint cmdId, int ObjId, P4.TaggedObject t) { string action, oldAction, haveRevStr, depotFile; t.TryGetValue("action", out action); t.TryGetValue("oldAction", out oldAction); t.TryGetValue("haveRev", out haveRevStr); t.TryGetValue("depotFile", out depotFile); if (haveRevStr == null || haveRevStr == "none") haveRevStr = string.Empty; else haveRevStr = "#" +...
If a file does not exist in perforce, you cannot edit it. If a file is currently opened for add, you don't need to edit it. When you submit the change that contains the add, the contents of the file at that time are used. Once you have submitted the...
Import Existing Projects will only import Eclipse projects - which always have a .project file. To import something else you will first have to create an appropriate project in Eclipse with 'File > New > Project....'. Once you have the project you can use 'File > Import > File System'...
version-control,perforce,perforce-integrate
You can certainly integrate and edit in a single changelist. There are pros and cons to this approach: some people appreciate, as you pointed out, that the code that is submitted back to the main codebase contains the desired edits immediately, without requiring a separate revision to be submitted, while...
The latest versions of P4Eclipse no longer supports Eclipse 3, but an older version (2013.1) is still available if hidden. Choose Help --> Install New Software. After "Work with:" enter http://www.perforce.com/downloads/http/p4-eclipse/install/3.8 Under Perforce Team Provider Core select Perforce SCM support...
To remove an over-riding binding from a mode keymap, so that Emacs will fall back to what it would usually use, you would normally do something like this: (eval-after-load "vhdl-mode" '(progn (define-key vhdl-mode-map (kbd "M-e") nil) ;; unbind M-e (define-key vhdl-mode-map (kbd "M-a") nil))) ;; unbind M-a As MrBones comments,...
Upgrade your Perforce server to 2014.2: http://www.perforce.com/perforce/doc.current/user/relnotes.txt Minor new functionality in 2014.2 #841159 ** 'p4 reconcile' will now detect files that are open for edit but missing from the client, and reopen them for delete. A workaround is to do "p4 revert -k" prior to "p4 reconcile" so that it'll...
I couldn't reproduce this with a simple experiment (I used Perforce 2013.3, which is the version I happen to have): C:\Users\Bryan\perforce\my-test-server>mkdir P4SSLDIR C:\Users\Bryan\perforce\my-test-server>set P4SSLDIR=C:\Users\Bryan\perforce\my-test-server\P4SSLDIR C:\Users\Bryan\perforce\my-test-server>p4d -Gc C:\Users\Bryan\perforce\my-test-server>dir P4SSLDIR Volume in drive C is OS Volume Serial Number is 6602-B38E Directory of C:\Users\Bryan\perforce\my-test-server\P4SSLDIR 05/24/2015 09:36 AM <DIR> . 05/24/2015...
Instead of using 'fstat', you could do 'p4 -ztag filelog -m1 -s //path/to/file'. It will produce output something like: C:\Users\Bryan\perforce\client>p4 -ztag filelog -m 1 //depot/a ... depotFile //depot/a ... rev0 1 ... change0 1 ... action0 add ... type0 text ... time0 1399680148 ... user0 Bryan ... client0 Dell660 ......
After working at this for three days, I found the issue with help from this forum post: http://208.74.204.155/t5/forums/forumtopicpage/board-id/Getting_connected/thread-id/8923/page/1 My router model (Hitron Technologies CGN2-ROG) that I received from my ISP (Rogers up here in Canada) apparently doesn't play nice when it comes to port forwarding. With all of the EXACT...
c#,visual-studio-2013,perforce
As already mentioned, bin and obj should be excluded, the reason being that they contain products of the compiler, which need not be shared. As other people have already pointed out, user specific information should also be excluded from any kind of versioning. User specific settings need not be shared....
p4 where will tell you where a depot file is located locally. You'll need to take the output of p4 opened and use p4 where to translate each depot path to a local path. This answer might provide some hints. Edit: Also see if p4 -ztag opened suits your needs....
Ah, never mind, I found the subcommand I needed, p4 fstat, just after posting the question. $ p4 fstat cama_Preempt#1 ... depotFile //depot/MMA/products/CAMA/main/src/testScripts/cama_Preempt ... clientFile /ext1/acheong/CAMA/main/src/testScripts/cama_Preempt ... isMapped ... headAction add ... headType text ... headTime 1174070670 ... headRev 1 ... headChange 168703 ... headModTime 1174070479 ... haveRev 1 The...
git,svn,perforce,perforce-client-spec
Yes, you can update the stream spec without invoking your interactive editor by using 'stream -i' and providing the stream data on stdin. For example, prepare a file with the information that you would have typed in your editor, call it 'streamdata.txt', and enter: p4 stream -i < streamdata.txt ...