Sourcetree shows duplicate files in pending view. Is this a bug?

I'm working on a big project using Mercurial. I had local changes to a few files, and a colleague committed changes to one of those files to our central repository. Before committing my changes to my local repository, I decided to do a pull and an update. Now, Sourcetree is listing the simultaneously modified file twice in the pending changes view.

Is this normal or a bug? If it's normal, how should I do my commit now?


3 answers

1 accepted

1 vote
Accepted answer

This is a bug, but I can't see how it could happen, I can't reproduce it here. The way you query general file status and merge status is separate in hg, so we query both then merge the results based on the path, but in your screenshot the paths clearly match 100%.

You can still go ahead and commit - just allow all the file entries to be checked in the commit dialog (this is required for merges anyway, you have to commit everything) and it will still work fine. I'll try to figure out how this edge case might have occurred.

Actually if you get chance before committing, it would be useful if you could run these two commands on the command line and tell me what they show in your case:

hg status
hg resolve -l


Here's the result of those commands (I'm running them inside Cygwin)

$ hg status
M Editor/Src/Application.cpp
M Projects/Jam/EditorFiles.jam
A Editor/Src/Utility/EditorUpdateCheckBhvr.cpp

$ hg resolve -l
R Editor/Src/Application.cpp

I saw this also with a bitbucket repository, when need to merge file it will appear twice in the list.

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Oct 23, 2018 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...

981 views 4 2
Read article

Atlassian User Groups

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

Find a group

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

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you