Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Deleted user
0 / 0 points
Next:
badges earned

Your Points Tracker
Challenges
Leaderboard
  • Global
  • Feed

Badge for your thoughts?

You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.

Join group
Recognition
Give the gift of kudos
You have 0 kudos available to give
Who do you want to recognize?
Why do you want to recognize them?
Kudos
Great job appreciating your peers!
Check back soon to give more kudos.

Past Kudos Given
No kudos given
You haven't given any kudos yet. Share the love above and you'll see it here.

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Sourcetree external diff changed (for the worse)

It used to be that when I did an external diff (using BBEdit), the local file was actually used as one side of the comparison, so I could edit right there in the external diff application (BBEdit).

Now, unfortunately, both sides are temporary copies in /private/var/folders. I regard this as a bug, because it removes an important piece of functionality. Or is there a secret setting for returning to the old behavior?

1 answer

0 votes
Manju Atlassian Team Jul 17, 2018

AFAIK, this is not something managed or controlled by Sourcetree. Sourcetree hands off the control to the external diff tool by executing the designated command. However, I will try to find out if we can do something about it. It would be helpful if you can kindly file a ticket on http://jira.atlassian.com/projects/SRCTREE/

Thanks!

I think I can say a bit more about this! It looks to me like the problem arises only when I do an external diff right after committing, so that there is nothing in the index. The current file is then represented by a copy in /private/var/folders.

The workaround is then to insert some trivial change into the file and do an external diff between the uncommitted changes entry and some past commit. Now the current file is represented by itself in the external diff.

What I'm saying, then, is that the original file (if that's what I'm comparing to) should _always_ be represented by itself, so that I can edit it in the external diff application (BBEdit) as I'm looking at the diff.

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

3,390 views 4 5
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you