Issue #412 new

abort: untracked files in working directory differ from files in requested revision

FlorianGeorge
created an issue

I don't have a repo case for this (yet), so I am marking this as minor, and post it rather for reference if someone stumbles across the same issue.

I am working on the Main Branch of an SVN Repository, using TortoiseHg and hgSubversion.

A coworker was working on a different branch of the same repository.

Between me syncing the last time, and this time, he

  • Finished working on his branch
  • Updated his branch with changes from the main branch that got added while he was working on his branch
  • Then merged his branch into the main branch
  • Some conflicts arose, he solved them, and finished the merge

He did all this with TortoiseSVN.

Now, when I wanted to push my locally committed changes with tortoiseHg/hgSubversion, the action aborted quite early with the message

abort: untracked files in working directory differ from files in requested revision

Looking at the log, when tortoiseHg updated to the head revision before rebasing/pushing my commits, I received for every file the coworker had added from the branch a "V:....\abc.cpp - untracked file".

I could manually work around the issue by updating to the newest head revision and rebasing my commits manually.

I can't expect this to be fixed when I can't give more information, but I just wanted to note it down.

Comments (0)

  1. Log in to comment