I use git a lot, but I am a newbie to P4 command-line. I've used P4V, but do not have that option now. I attempted to integrate changes from a staging branch to our mainline:
p4 integrate //depot/working/staging/...#124466 //depot/mainline/...
p4 submit
This brought up a must resolve issue with one of the files.
Merges still pending -- use 'resolve' to merge files.
So, I ran p4 resolve. That gave me the options to merge, edit, etc. I chose edit. While in the edit screen, I hit some key-stroke that made the edit window close. Now I'm stuck. I cannot finish resolve-ing. None of the commands I've tried seem to work:
p4 resolve
p4 resolve -c 124570 - the changelist created by p4 (?)
p4 revert - to revert changes
p4 revert -c 124570
p4 revert -c 124570 <the file>
On all of these the cursor just sits there. No action.
I tried running p4 submit -c 124570. This gives me the use resolve message again, but that does not work.
Any ideas? I do not know what else to Google on for this. Help would be greatly appreciated.
It sounds like the editor process is still running in the background, and p4 is waiting for it to exit so that it can continue with the resolve.
It would help to know what your editor is, but I'm going to take a wild guess that you're on a Mac and it's TextEdit, because it's a very common offender here -- click TextEdit in your dock and then go to TextEdit > Quit TextEdit. (In the future you might want to p4 set P4EDITOR=vi or something else that will exit promptly when you close the file, as this plays much better with command line tools.)
If it's not TextEdit but you know how to use a command line, use your command line expertise on your platform to just kill the editor (ps/kill or whatever).
Failing all that, go back to that blinking cursor and hit Ctrl-C to just kill the p4 process. That'll work everywhere. :P When you p4 resolve again it should just pick up approximately where it left off (in whatever state it was able to record to the workspace and/or server before you killed it).
I also faced similar issue, my config file, p4editor, port was right. Then also resolve command was getting stuck.
Fix: add the cl# with -c and resolve mode to automatic.
p4 resolve -am -c <CL#>
am is automatic mode. For other modes please refer to:
https://www.perforce.com/manuals/v15.1/cmdref/p4_resolve.html
Related
so i've been wondering for a while now what the pop ups of git bash i get are whenever i open vscode or switch tabs in it (like going from index.html to styles.css file). I managed to find the output from it but to be honest i have no idea what that is or how to stop it from appearing. It's not really affecting me, it's just somewhat annoying. Welp, any help would be appreciated and if you do understand please explain to me to have an idea of what that is. Thanks!
When I rename folders in VSCode intellisense gets confused. Is there a way to reset intellisense?
If you run the Reload Window command from the VS Command Palette it will restart the analysis server, which will reanalyse and should fix things up.
However, this seems like a nasty bug. Would you mind running the Dart: Capture Logs command, reproducing the issue and then opening an issue on GitHub with the log (please review it for anything sensitive) and detailed steps so we can investigate?
The first time I used git bash, backspace was working fine. Then I installed Perl and didn't use git bash for a few days.
When I use backspace in git bash now it doesn't work correctly.
For example, trying to remove the second s and everything after it in ussers:
Now when I use the backspace this happens:
Can anyone help?
I had this same problem today after switching to mintty with a fresh version of git. In my case, it was an old .bashrc file I'd been carrying around for many years with the line export TERM=ansi. After removing that and starting a new bash, everything works again.
More generally, to debug, I was suspicious of all the dot-config stuff in my home directory--so I moved things like .bash_profile, .bashrc, .inputrc, etc. into a temporary directory where they wouldn't be read by bash. Then, I started bash and saw that it worked. I mention it because, if it isn't specifically the TERM issue I had, you might be able to debug using the same technique.
Not sure if this is the same issue.. But I ran into the same after upgrading git
This helped me.. Just enter TERM=XTERM in the bash
I got this from an issue log in github..
screenshot
Just in case people run into a capitalization issue please type TERM=xterm-256color directly into git bash and hit enter. This fixed my issue.
Right click on the menu/title bar of git bash, select options, click on terminal from the options on the left, under the 'type' dropdown, select 'xterm', then apply and save.
Now open a new git bash and it should work :D
I mount an sshfs file system with
% sshfs remote.host.org:/home/jrm /home/mnt/remote.host
then edit a file under this file system with
% emacsclient -n /home/mnt/remote.host/some_file.c.
When I save the file I get the warning
some_file.c has changed since visited or saved. Save anyway? (yes or no)
Other editors don't have this problem. What is causing this? How can I prevent it? Both hosts are running ntp and the times are the same.
TIA.
P.S. I'm aware that I can open the files directly with tramp, but I prefer sshfs assuming I can get rid of this warning every time I try to save a file.
I had this problem and one solution is to just ignore the warnings that the file has changed if you're sure you won't be writing over something important.
I wrote a small minor mode to ignore all file change warnings called modtime-skip-mode
you can find the repo here:
https://github.com/jordonbiondo/modtime-skip-mode
this package is also on Marmalade so if you have that setup you can just
M-x: package-install <enter> modtime-skip-mode <enter>
I have a question about clearcase. in linux, I open a terminal, and use "xclearcase" command to lunch file browser of clearcase. Then I check out a file and I want to open it in Emacs, I know I should cd to the folder contains the checked out file, but before I do this, the terminal still effected by the "xclearcase" command, how could I type some commands now?
When you launch xclearcase, do so by adding a & to the end of it. This will make the shell send it to the background so you can do more stuff in your shell. E.g.
xclearcase &
That will allow you to further interact with your shell while xclearcase is running.
Also, if you're working in the terminal, I would recommend getting comfortable with cleartool for basic operations. For example, to checkout and edit a file:
cleartool co src/path/to/file.c
emacs src/path/to/file.c
Then, to checkin the file:
cleartool ci src/path/to/file.c
As Nemo mentions in the comments, the vc-clearcase Emacs mode allows you to checkout a file right from an Emacs session (C-x v v).
It will handle hijacked file, asking whether to keep the changes in said hijacked file through the question "Claim lock retaining changes?"
It will ask for a comment
It allows for checkouting a directory
It handle file with a -nocheckout rule on their config spec