https://bugs.kde.org/show_bug.cgi?id=374898
--- Comment #1 from Frank Fischer <frank-fisc...@shadow-soft.de> --- I'm not sure about this anymore. Apparently, git updates only files on pull that do not have any conflicts. Mercurial's pull -u, however, would force a merge (possibly leaving conflict markers in the file). According to the documentation of IDistributedVersionControl::pull, it should only get changes but do not merge them into the working tree. This is what mercurial's pull without -u would do. The difference to git is: - if there are no conflicts, "git pull" will move HEAD to the newly pulled change, "hg pull" will just get the changes but does not update working tree - if there are conflicts, "git pull" will just fail, leaving HEAD at its old position In my opinion (and according to the documentation of IDistributedVersionControl::pull), the plain "hg pull" (without -u) is the correct thing to do, and the implementation for "git pull" should rather be "git fetch" (but does this make sense because one would have to use FETCH_HEAD to refer to the newly pulled changes?). I'm not sure here, maybe the difference is just fine and necessary because of the differences between git and hg. -- You are receiving this mail because: You are watching all bug changes.
