Fix accessing a repository via -R/--repository through a symlink. Sometimes the repository root was compared to os.getcwd(), which always uses the canonical path without symbolic links in it. This would changes self.root of the localrepo objects to always use os.sep as the directory separator, which is implicitly assumed in some places, but may not be the case if somebody uses -R foo/repo on windows.

Merge with upstream

Fix up parent display in logging For changesets with a first parent nullid, but not rev 0, we ought to display a null parent.

Clarify untracked file merge message