Ever since my most recent update to SourceTree, version 2.2, it's crashed after every external merge I've done. My tool of choice is TortoiseMerge.
Has anyone gotten the same behaviour and, if so, know how to resolve the issue?
I have the same problem. When doing a KDiff merging, at the moment of saving the merged file : SourceTree stops working. The file is however correctly saved but I have to restart SourceTree each time.
This appends since I updated to version 1.8.2.
This is the Window log trace:
SourceTree.exe
Version du Framework : v4.0.30319
Description : le processus a été arrêté en raison d'une exception non gérée.
Informations sur l'exception : System.NullReferenceException
Pile :
à SourceTree.ViewModel.VisualMergeWindowViewModel.MergeProcessOnCompleted(System.Object, System.EventArgs)
à SourceTree.Utils.RepoProcess.OnCompleted()
à SourceTree.Utils.RepoProcess.DoCompletionFunctions()
à System.Diagnostics.Process.RaiseOnExited()
à System.Threading.ExecutionContext.RunInternal(System.Threading.ExecutionContext, System.Threading.ContextCallback, System.Object, Boolean)
à System.Threading.ExecutionContext.Run(System.Threading.ExecutionContext, System.Threading.ContextCallback, System.Object, Boolean)
à System.Threading._ThreadPoolWaitOrTimerCallback.PerformWaitOrTimerCallback(System.Object, Boolean)
I need a solution to keep using SourceTree UI for launch merging process. Help!
I may have a temporary solution:
Launch the external merging tool:
Save your merged file with this same tool
Instead of closing the external merge tool, come back on SourceTree UI and click on "Abord" : it will close the tool without crashing.
The file being yet well saved, click right on it and select "mark resolved"
Delete all generated back up files 'created because of the previous "Abord" action)
Hope that help! It works for me
See this link:
https://jira.atlassian.com/browse/SRCTREEWIN-4499
you can use terminal and git mergetool command
Related
When using stock VS Code Version: 1.71.2 on macOS 12.6:
A file that is chmod 444 does not show the 'lock' icon and does not block edit actions.
vscode only reports that it is 'read-only' when one tries to write the file.
Q: is that intentional or a bug? or something new to macOS-12.6?
Q: Does vscode to the right thing on Windows or Linux?
(that is: show the 'lock' and block edit acions)
I've been told this is known and possibly intentional:
https://github.com/microsoft/vscode/issues/134876#issuecomment-940851828
On the other hand, I found that it is trivial to fix, and was likely an oversight/bug.
This (line 93; plus constructor arg) will fix the problem
https://github.com/jackpunt/vscode/commit/7639971f3d0467ec6c923b89bf189bdc653b9969
You can clone that repo to get that fix, and also all read-only goodies from https://github.com/microsoft/vscode/issues/161715#issuecomment-1262947768
(still [Nov 2022] waiting for the vscode owners to pull that...)
Related: https://github.com/microsoft/vscode/issues/17670
Background
I have been trying for the last week to rebase a clearcase view for my project, but every time I try I get a weird null exception depicted in the two windows below:
I do not know why this is occurring and need help determining how to even begin fixing this issue.
So far here is what I have tried:
Restarting the client
Restarting my computer
Refreshing the view and updating.
Updating my eclipse environment.
I have also seen a fix on the IBM website for a similar issue, but my version of Clearteam explorer is well beyond the version it prescribes for a fix:
When you are trying to login with the IBM Rational ClearTeam
Explorer (CTE) version 8.0.1.11 and later with the Eclipse
plugin, you may receive the following error: CRMAP7009: Command
"Login" failed: Error: "java.lang.IllegalStateException: null"
This behavior does not occur with CTE 8.0.1.10 with the Eclipse
plugin or with the standalone CTE 8.0.1.11 client.
It only occurs using the Sun JRE 6, not when using the IBM JRE
6.
My clearteam explorer version is 9.0.2:
Question
What are other possible actions I can take to fix the null pointer issue mentioned above?
OK, you're going to hate this, but the only thing I can do is ask questions and point you to IBM/HCL support.
Is this a web-based view? A snapshot view? A Dynamic view?
Does a new view work?
Are there any errors in the CTE workspace log? (%USERPROFILE%.Rational\CTE8\workspace.log)
Is this the CTE plugin installed into Eclipse? Or the CTE "full" client? And does it matter?
Have you tried this using the command line interface (cleartool/rcleartool as appropriate)
Does running in debug mode tell us anything additional? (See https://www.ibm.com/support/pages/how-enable-trace-ccrc-client-and-server) Note that on windows, CTE/eclipse will spawn a separate console window to print some eclipse diagnostic output that may or may not be important. You'll want to capture that before exiting the session.
If this is a web-based view, has anyone checked the WAN server logs?
CRMAP7009 is a "catch all" message for CTE, but since that is an exception message, it should be expanded upon SOMEWHERE. Half the battle is finding the rest of the message.
In those case, I always try and fall back to command line, using in your case cleartool rebase.
See "Rebase a stream on linux using cleartool" (the same idea applies on Windows), and "How to rebase in ClearCase on latest baselines?".
That way, I can see if the issue is with ClearCase itself or with the Eclipse ClearCase plugin.
I can't figure out why my MDA transform all of a sudden do not create any PDM out of my checked out LDM. It usually works as expected, but i now get this message during the transform progress: "Skipping: Locked class - CLASS_NAME".
I use SVN for package versioning and made sure thtat the underlying XMI file for the package is unlocked in SVN. I have no idea about why all my classes are locked and no clue how to unlock these...
You have to use EA to checkout your packages. If you unlock it using SVN directly then EA doesn't know about that and will assume it is still checked in.
What you can do to fix that use the menu option Package Control - Re-synch Status with VC Provider
With a git repository setup for my iPhone app, is there a way to gain access to the last committed version of a file outside of XCode? Can I find the previous version somewhere on the hard drive, or perhaps piece the file together somehow? The current version of the file is now corrupt (see story below for how this happened if interested), and I'd very much like to retrieve the changes I made since the last time I was able to backup the files outside of git. I don't have the ability to access anything in XCode or run anything on the Mac outside of what's available through Max OS X Installer, so I'd like to access the previous version of the file if that is possible.
Story that pisses me off begins here:
On a recent 6 hour flight, I took my MAC with me on the plane, committing changes to the git about 2 times during this period. Everything functioned fine on the MAC all the way until we had to shut down all electronics at the end of the flight. At that time, I told the MAC to shutdown, but it froze instead. Wanting to avoid an airline incident, I forced the computer to shutdown by holding the power button after waiting for over a minute.
When I turned on the computer later that night, it would no longer boot, instead freezing on the Apple logo and the spinning gear. I used my install disk to bypass logging in and accessed Disk Utility, which proceeded to FAIL repairing my drive. The hard drive still mounts, so I'm able to get into my files. I accessed the absolutely essential file needed for my app, and when I opened it on my Windows machine it contained garbage. Of course most of the other files were all fine :-/
Story that pisses me off ends here.
So, I'm still trying to fix my stupid MAC, but before proceeding and possibly needing to wipe the drive, I'm trying to grab all the files I can, so any help is definitely appreciated.
To wipe out the current changes and see the most recent committed version,
git checkout HEAD .
To wipe out the current changes and see the previous committed version,
git checkout HEAD^ .
I get this error :
Share project was failed.
svn: Error writing entries file for
'C:\workspace2\Test'
svn: Entry '' has inconsistent
repository root and url
But we get this error only on a particular PC. Also if we move the workspace in a network drive, everything works fine.
We are using FDT(eclipse based IDE).
We are totaly new to SVN...
I am looking for any advice who will helping us solving the problem
UPDATE:
Without any particular change the problem is gone ?!
Can you reproduced the issue with the latest Eclipse (Galileo 3.5.1)?
And what Subversion Eclipse plugin are you using? (Subversive or Subclipse?)
There was a bug with Subversive with path including a special character (like ~).
In your case, check the 'C:\workspace2\Test' has no special character in it, like a space at the very end. ('C:\workspace2\Test')