- #Diffmerge vs meld sourcetree manual
- #Diffmerge vs meld sourcetree full
- #Diffmerge vs meld sourcetree windows
#Diffmerge vs meld sourcetree windows
It seems to me that the problem is that the path that git bash is using is not the one that Windows is using. Here are all of my difftool settings if you want to make the switch: Ĭmd = "\"c:/program files (x86)/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\""Ĭmd = "\"c:/program files (x86)/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"" I actually do most of my diffing on Windows nowadays with Beyond Compare 3 Pro, though sometimes I will still use DiffMerge. I'm currently using Git 2.0, but I seem to recall having set this up with either Git 1.8.x or maybe even as early as Git 1.7.x, so try it out and see if it works. Note that I'm using msysgit Bash (not sure if it will be different for Cygwin or PoshGit users): Ĭmd = C:/Program\\ Files/SourceGear/Common/DiffMerge/sgdm.exe \"$LOCAL\" \"$REMOTE\" Rolf thanks for the summary, this gives me a better picture of whats going.Not sure if this well help, but this is my configuration for difftool with DiffMerge.
I don't have much experience with other IDE's outside of labview and webstorm.
I have run into the dependency nightmare you mentioned and it is a huge pain. I need to dig around and see if there is a VI server method for performing this revert. The reason i bring all this up is that i am currently in the process of writing an open source project provider for integrating TortoiseGit into the project window. All the basics are there currently and i'm hoping to release a beta for people to play with shortly.
#Diffmerge vs meld sourcetree full
The long term goal is to bypass TGIT and integrate direct GIT Source Control into LV but since TGIT is already developed its a decent place to start.Ĭurrently i've given the user the ability to reload the project from within the provider and i'm just trying to solidify which actions are going to require a full project reload. It appears that basically any situation in which you are working within the project window and you need to revert or switch branches the user is going to have to reload the project to accurately see any Source Control changes. There are a variety of issues with this, such as saving after the switch or revert but those can be overcome with prompts to the user at the right time.ĭoes closing a project, assuming all vi's are within that projects context and are closed, guarantee that all project VI's are unloading from memory? I'm really hoping a full LV restart is not required every time you need to reload VI's. I'm not sure I understand the entire problem here. You may have to consider different file types differently. As long as you do not have any VI open, even if your project is loaded, just changing the VI on disk shouldn't cause troubles with LabVIEW remembering any old VI code. This assumes that the VI names and/or path don't change. You should be able to simply do a revert or branch without any strange influences. When you then open the main or any other VI from the project you should be fine. If names and or paths change, things get more complicated. But assuming that the GIT repository state was consistent at the moment the reverted or branched situation was taken as far as LabVIEW is concerned, this would also mean that the lvproj file and lvlib files have changed, because these are were the actual paths are recorded for management reasons. So if your GIT operation changes any of these files then yes you will have to find a way to reload the project and/or libraries that are affected. So if you have a way to determine that such files have changed you could attempt to do a smart reloading.
#Diffmerge vs meld sourcetree manual
Otherwise it would seem the safest option to reload the entire project every time you do an action that could potentially change the project and/or library files under the nose of LabVIEW.Ītlassian support and Git support have both pointed out that local and remote are consistent with the definition in the manual for difftool. Gitconfig file:Ĭmd = ''C:/Users/Paul/AppData/Local/Programs/Git/bin/_LVCompareWrapper.sh'' "$REMOTE" "$LOCAL" #DIFFMERGE VS MELD SOURCETREE MANUAL# The associated wrapper script contents are:
# The -W parameter on the pwd command is necessary to return the Windows version of the path.
0 kommentar(er)
