Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

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 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?

Thanks.

3 answers

1 accepted

1 vote
Answer accepted

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

Thanks

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
TAGS
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

5,011 views 0 12
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