meld
AOP for JS with before, around, on, afterReturning, afterThrowing, after advice, and pointcuts
When there's a collison during git merge, I open a mergetool called Meld. It opens three files LOCAL, BASE and REMOTE. As I've read LOCAL is my local branch, BASE is common ancestor and REMOTE is the branch to be merged.
Now to my question: which version of the file will be finally used? Is it REMOTE? If so, can I edit it as I want, regardless what's in the BASE branch for example?
Source: (StackOverflow)
Up to now I used emacs ediff mode for merging. I tried meld, but could not find a way to make one buffer/file read only. I never merge in two directions, that's way I make one part read only before merging.
Source: (StackOverflow)
I have Tortoise SVN but I don't like the diff tool. Is there a way to use Meld with tortoise SVN? I know tortoise has an option to set external diff tools, but I am not sure how to use that with meld.
Source: (StackOverflow)
After I got MacPorts installed and did a 'sudo port -v selfupdate', I try to install meld.
The installation just starts to Fetching all kinds of stuff
gnome-comoon
perl5.8
perl5
pkgconfig
.....
this goes on and on.
Is that normal?
Source: (StackOverflow)
I want to resolve some conflicts of an SVN file using Meld. I'm using the Head version and my version to resolve the conflicts. I am unable to find how to do the merge operation and resolve the conflicts. When i'm right clicking on the line, i just see copy, paste, cut, create patch copy to right, copy to left options. Is there any way to do "Copy this line after mine" or "copy this line before mine" like that?? I used WinMerge when i was working on Windows. Now i moved to a Ubuntu machine and facing this situation for the first time. Please help me how to resolve the conflicts using Meld.
Thanks in advance
Source: (StackOverflow)
Why does 'git mergetool' (meld) show me the ancestor view WITH conclict markers? This is totally wrong and I've never understood why it does this. How can I fix it?
A 3 way merge should show
[ Your Changes ] [ Common Base ] [ Upstream Changes ]
What I get is:
[ My Changes ] [ File with Conflict markers ] [ Upstream changes ]
See: 
Source: (StackOverflow)
How do I get a GUI-based merge tool to work with command line SVN in linux? I understand that there are many options like meld, svn Diff, etc. out there. All of them require a helper script to allow svn to invoke the external program during conflict resolution. I followed the instructions given here and the nice svn manual with meld.
But in all cases, when I get to the merge conflict and type 'l' to invoke the external tool, I get an error: The external merge tool exited with exit code 255
I'm fairly certain I'm missing some key thing here. ITs too much of a coincidence for so many different solutions to fail. Would appreciate any solution or pointers to the problem.
Thanks!
Source: (StackOverflow)
I want to use meld to view the difference between revisions. I installed meld and then executed in the project directory:
svn diff -r 2165:2182 --diff-cmd meld
but it thows up the following error:
Index: app/models/college_friends_count.rb
===================================================================
svn: E200012: Process 'meld' failed (exitwhy 2)
Can anybody tell me what is going wrong here?
Source: (StackOverflow)
Having read Completely manual Mercurial merge, I have such a .hgrc:
[ui]
merge = meld
[merge-tools]
meld.priority = 1
meld.premerge = False
meld.args = $local $other $base
[merge-patterns]
** = meld
However, hg merge -r REV just works and I don't get what i'm missing...
I'd like to do a manual merge to drop some of the changes the other branch introduces. The other branch has a changeset affecting several files and I don't want to modify them all.
Source: (StackOverflow)
I am using Git 1.8.4 and Linux (Kubuntu 13.10).
I have a Git repository with submodules. If I ask for directory diff in the main Git module, it works fine. If I do the same in one of the submodules, I get an error:
~/Projects/MAINMODULE/platform/SUBMODULE [master]$ git difftool -tool=meld --dir-diff --cached
fatal: Could not switch to '../../../../platform/': No such file or directory
diff --raw --no-abbrev -z --cached: command returned error: 128
~/Projects/MAINMODULE/platform/SUBMODULE [master]$ cd ..
~/Projects/MAINMODULE/platform [master]$ cd ..
~/Projects/MAINMODULE [master]$ git difftool -tool=meld --dir-diff --cached
// NO PROBLEM, works.
~/Projects/MAINMODULE [master]$ git version
git version 1.8.4
Do you have any idea? May it be a Git Bug?
UPDATE: 1.8.5.3 produces the same output
Source: (StackOverflow)
I'm trying to apply a patch for meld from https://bugzilla.gnome.org/show_bug.cgi?id=680569 myself, and am having trouble with this:
$ git clone git://git.gnome.org/meld
$ cd meld
$ python setup.py build
$ bin/meld
2014-01-11 16:30:44,736 ERROR root: Could not find any typelib for GtkSource
Cannot import: GtkSourceView
cannot import name GtkSource
I know little about Python, and e.g. do not know (yet) what a typelib for Python is - enlighten me! ;-) I've looked around, and vaguely figured that this has something to do with an exotic fruit ;) named gir, but this doesn't seem to help:
$ sudo apt-get install gir1.2-gtk-3.0
gir1.2-gtk-3.0 is already the newest version.
$ sudo apt-get install gir1.2-gtk-2.0
The following NEW packages will be installed:
gir1.2-gtk-2.0
Setting up gir1.2-gtk-2.0 (2.24.20-1ubuntu1) ...
$ bin/meld
2014-01-11 16:32:24,133 ERROR root: Could not find any typelib for GtkSource
Cannot import: GtkSourceView
cannot import name GtkSource
What am I missing? Thank you!
Source: (StackOverflow)
I found that other people too have had trouble in installing Meld to Mac by MacPorts.
I run
sudo port install meld
I get
sudo port install meld
---> Activating shared-mime-info @0.60_0
Error: Target org.macports.activate returned: Image error: /opt/local/bin/update-mime-database already exists and does not belong to a registered port. Unable to activate port shared-mime-info.
Error: The following dependencies failed to build: py25-gnome gconf gtk2 shared-mime-info orbit2 libidl gnome-vfs desktop-file-utils gnome-mime-data libbonobo libbonoboui libglade2 libgnome esound audiofile libgnomecanvas libart_lgpl libgnomeui gnome-icon-theme hicolor-icon-theme icon-naming-utils p5-xml-simple p5-xml-namespacesupport p5-xml-sax gnome-keyring libtasn1 py25-gtk py25-cairo py25-numpy py25-nose py25-gobject py25-orbit
Error: Status 1 encountered during processing.
How can you install Meld to Mac?
Source: (StackOverflow)
I've configured git to use meld as an external diff tool:
$ cat ~/.gitconfig | grep -A2 "\[diff\]"
[diff]
tool = vimdiff
external = git-meld
... where git-meld is:
$ cat $(which git-meld)
#!/bin/bash
meld $2 $5
However sometimes (e.g. in the case of very minor diffs or if I want to easily copy-paste something from the diff text) I just want to see the differences on the shell and avoid meld's spawning delay.
Is there a way (e.g. a command line argument) to override the .gitconfig settings and instruct git to just do a simple text-only diff?
Source: (StackOverflow)
I'm installing meld on Mac OS using port.
It has downloaded all dependencies and told that everything is ok:
Staging meld into destroot
Installing meld @1.5.3_0
Activating meld @1.5.3_0
Cleaning meld
Updating database of binaries: 100.0%
Scanning binaries for linking errors: 100.0%
No broken files found.
but when I run:
[18:28:24]~$ meld
Traceback (most recent call last):
File "/opt/local/bin/meld", line 75, in <module>
locale.setlocale(locale.LC_ALL,'')
File "/opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/locale.py", line 539, in setlocale
return _setlocale(category, locale)
locale.Error: unsupported locale setting
what is the problem and how to deal with it?
Source: (StackOverflow)
Is it possible to use a different diff program with CVS? I'd like to use something like meld to give me a side-by-side graphical view of the repository and my changes. It's out of my control to use a different CMS. What would be ideal is some undocumented command line argument that would work like this:
cvs diff -prog /usr/bin/meld foo.cc
This would give me a diff of my checked out, modified version of foo.cc with the repository version, but using the diff program meld.
I realize an undocumented command line argument is unlikely, so if you have to hack it together, that works for me.
Source: (StackOverflow)