I'm trying to use an external merge tool (Tortoise Git) whitin Webstorm, but I encountered a problem. I can figure out how to replace the following placeholders in the "Parameters" input: $LOCAL, $REMOTE, $BASE and $MERGED.
As you can see I have %1 %2 %3 %4 which I must replace somehow. I've tryed with
$LOCAL $REMOTE $BASE $MERGED
but it didn't work. Can anybody help?
EDIT
The next problem is that when I encounter a conflict, TortoiseGit doesn't seems to find the files needed so I can process the merge.
Here I have a conflict with index.html and I press "Merge".
Here TorgoiseGit ask me for the files.
So here I'm asking, how to configure WebStorm so TortoiseGit find these files automatically?
problem is caused by incorrect options escaping in WebStorm (IDEA-156227). I can suggest the following workaround:
create a new .bat file (C:\tortoise_launcher.bat, for example) with the following content:
start "" "C:\Program Files\TortoiseGit\bin\TortoiseGitMerge.exe"
-base:%1 -mine:%2 -theirs:%3 -merged:%4
change Settings | Tools | Diff | External Diff Tools as follows:
Path to executable: cmd.exe
Parameters: /C C:\tortoise_launcher.bat %3 %1 %2 %4
This configuration works fine for me
The Parameters may be:
/theirs:"%1" /mine:"%2" /base:"%3" /merged:"%4" /theirsname:"Local changes" /minename:"Server content" /basename:"BASE" /mergedname:"output"
(cf. TortoiseGitMerge Command Line Switches)
This is my testing:
TortoiseGitMerge.exe /theirs:"D:\left.txt" /mine:"D:\right.txt" /base:"D:\base.txt" /merged:"D:\output.txt" /theirsname:"Local changes" /minename:"Server content" /basename:"BASE" /mergedname:"output"
Something like this:
Add this reg will allow you to see the actual command line:
Windows Registry Editor Version 5.00
[HKEY_CURRENT_USER\Software\TortoiseGitMerge]
"Debug"=dword:00000001
Perhaps help to figure something out. It will show a message box, something like this:
Related
I am trying to put the gdb to run with eclipse cdt on ubuntu to start debugging some simple programs. So I did the steps I reckon as necessary to get it running:
1. Create an executable project
2. Compile
3. Run
4. Create the file .gdbinit and place it on the main project folder
5. Set some of the debugger configuration:
5. I also tried to find a .gdbinit file that would look some like this:
set schedule-multiple
dir ~/gcc_build/4.7.2/build/gcc
dir ~/gcc_build/4.7.2/gcc
dir ~/gcc_build/4.7.2/gcc/cp
dir ~/gcc_build/4.7.2/gcc/lto
source ~/gcc_build/4.7.2/build/gcc/gdbinit.in
But I didn't find anything similar in my computer, even after doing a:
# find / -name .gdbinit
So, my file .gdbinit end up with the simple content - yes only that:
set new-console on
Then I clicked on Apply and Debug:
The gdb starts working nicely as expected. I press the button "step over / F6" and the debugger goes jumping through the code step by step. Until the point it reaches the command rand() and the gdb hangs with the message:
Can't find a source file at "/build/buildd/eglibc-2.19/stdlib/rand.c"
Locate the file or edit the source lookup path to include its location.
Thus I also tried unsuccessfully to find the rand.c to update this path to include its location:
# find / -name rand.c
# find / -name stdlib
After the error message from GDB complaining that rand.c is missing, then I tried to keep stepping... since then the stepping mode is disable when I restart the debug:
Is this problem happening because some setting for my file .gdbinit is missing? Or some how GDB is not able to find the rand.c from stdlib from c99? When I compile and run the program it runs nicely. Only when I try to launch the debugger is when GDB crashes.
Update: I got the missing rand.c problem after running the commands:
# apt-get install libc6-dbg
# apt-get source libc6
But now a different error appears:
Can't find a source file at "/build/buildd/eglibc-2.19/csu/libc-start.c"
Locate the file or edit the source lookup path to include its location.
Should I also install that library for gdb?
All suggestions are highly appreciated.
From what I saw on your description... looking to the 4th and 5th image you posted, you did right all the required steps.
However, it seems to me that your GDB is attached to several projects. That means that unless you really need that, I would strongly advise you to select all project that you are not currently debugging and delete them from the debugger mode. So, my suggestion is that after you have done all the steps you did so far, then go on:
Debug Configurations > C/C++ Applications: (drop down it)
... then click on each project you are not compiling, with right button from the mouse select "delete" - but don't worry, it will not delete your project, but only the attachment of that project to your debugger mode.
Then restart the eclipse. When you again try to run in the debugger mode, everything will run much smoother than before.
Step1:
Go to https://www.gnu.org/software/libc/ to download glibc.
Step2:
unzip it locally and whenever the eclipse prompts "Can't find ... xxx.c", just load the file into eclipse. It will work.
we're using xcodebuild for some Jenkins CI tasks.
We have an error that stops the build, but can't see what it is because xcodebuild limits the log length to the first 200 notices:
Showing first 200 notices only
** TEST FAILED **
Is there a way to remove the 200 notice limit? We know we can do this in Xcode using the UI, but need to be able to do it from the command line with xcodebuild
Just use xcodebuild cli.
In Jenkins set "invoke script" step with following content:
xcodebuild clean test -project SOMEPROJECT.xcodeproj -scheme SOMECHEME -destination 'name=iPhone 6,OS=9.1'
You can basically do this in one of the following ways:
a. Add this in your configuration files. OTHER_CFLAGS (Other C Flags)
e.g. OTHER_CFLAGS=-ferror-limit=0
b. GCC_PREPROCESSOR_DEFINITIONS (Preprocessor Macros)
c. INFOPLIST_PREPROCESSOR_DEFINITIONS (Info.plist Preprocessor Definitions)
If in Xcode you want to try, Select Show the issue navigator in left side pane ,select the target, if you have any linker warning or Dsymutil Warning , click anyone of that, you should be able to see the list of all the warning, filter it with by selecting "ALL" and "ALL Issues" in right side pane. You will now be able to see total warnings with details.
I've been trying to program an AppleScript that writes and exports an AppleScript . And so far, I've gotten as far as automating the writing of the script and getting to the "Export..." menu. I've pasted link to a screen shot of the menu that I've gotten to below.
Link to image
can someone please let me know (in the simplest way possible) a way to automate the clicking of the Application option under the drop down menu (is it called that?) named File Format using apple script. Can someone also please inform me of (if there is) a way to automate the clicking of the Run Only check box? If you are unsure what is where, the two spots (the list and the check box) is squared in red in the image.
#Darrick Herwehe's answer has the crucial pointer: use oascompile to compile AppleScript source code - no need for (cumbersome and error-prone) GUI scripting.
If you wanted to compile your AppleScript (plain-text) source file - e.g., some.applescript to:
application (bundle) some.app
with the execute-only (run-only) option (i.e., the plain-text source code is NOT included in the bundle)
you'd run
osacompile -x -o some.app some.applescript
Alternatively, you can even provide the source code as a _string:
osacompile -x -o some.app -e 'display alert "hello, world"'
If you wanted to achieve the same thing from AppleScript itself:
set src to "display alert \"hello, world\""
do shell script "osacompile -x -o ~/some.app -e " & quoted form of src
Note that the output format - an application bundle in this case - is inferred from the filename extension of the output filename passed to -o.
To invoke some.app directly from its output folder for a quick test, use:
open ./some.app
Caveat: There's at least 1 bug (around since at least 2012 and still there in OS X 10.9.2) that causes osacompile to compile incorrectly; see osacompile changing the AppleScript output so it won't run
I'm writing a C++ project that will occasionally use a system call to Weka to get some machine learning information. First I'd like to ensure that the training model (training.model) is up to date. So, at the beginning of main, I call:
system("\"java weka.classifiers.trees.J48 -t ML_data.arff -d training.model\"");
That gives Error: could not find or load main class weka.classifiers.trees.J48. I know what that means, so I moved the entire Weka project folder, entitled Weka-3-6, to the directory in which my project is found. So then I tried:
system("\"java \Weka-3-6\\weka.classifiers.trees.J48 -t ML_data.arff -d training.model\"");
But that returns Error: could not find or load Weka-3-6\weka.classifiers.trees.J48.
I feel like I'm in the right neighborhood, but I can't get the slashes right, and I'd prefer not to mess with absolute paths because the folders have spaces and that makes it even messier. Any ideas? Help is greatly appreciated.
Open a terminal/cmd prompt and try to run your command in your terminal/cmd prompt. Following is an example cmd batch script for windows. Your problem is most likely java classpath settings not weka problem. If you succeed in following command, then try your command with again in c++.
SET WEKA_HOME=C:\Program Files\Weka-3-7
SET CLASSPATH=%CLASPATH%;%WEKA_HOME%\weka.jar
SET HEAP_OPTION=-Xms4096m -Xmx8192m
SET JAVA_COMMAND=java %HEAP_OPTION%
%JAVA_COMMAND% weka.core.SystemInfo
Question is about how to tune this plugin to vim. I want to change behavior of it when I push \rc, i.e. I want compile the file. I want compile with g++ with -std:c++0x option. As I understand I should change global variable g:C_CplusCompiler from defaults value "g++" to "-std:c++0x g++".
Update: thanks #holygeek for showing right command to change global variable in vim:
:let g:C_CplusCompiler="g++ -std=c++0x". However it doesn't not help to compile with \rc and right option -std:c++0x. Any ideas? I have not found how to do it in manual :(
In vim set is used to set a setting. To set a variable use the let command:
:let g:C_CplusCompiler="g++ -std:c++0x"