+++ This bug was initially created as a clone of Bug #3612 +++ When using a filemap, it's possible to make convert insert double slashes, which later cause trouble: mkdir a cd a hg init mkdir foo echo a > foo/a hg addremove hg ci -m "a" cd .. echo "rename foo/a foo//bar//a" > f hg convert --filemap f a b cd b hg up hg st ## File foo/bar/a is untracked?? hg manifest ## Double slashes in manifest?? hg add foo/bar/a ## Ok, fine, let's add it again. hg ci -m "lol" hg verify ## Repo corruption?
Fix: http://hg.intevation.org/mercurial/crew/rev/7aa7380691b8
Erm, is this really fixed? I still see trouble when running verify on the following repo: http://hg.savannah.gnu.org/hgweb/octave/
Fix went on default branch despite code freeze rules. I'll fix this in the near future.
It went onto the default branch as a peer of the fix for bug 3612, but I merged it into the stable branch immediately afterwards. http://hg.intevation.org/mercurial/crew/rev/1f34b57ca319 So it is in fact fixed and should be in the right place.
Just checked - it's on the stable branch in Matt's repo. http://selenic.com/repo/hg/rev/1f34b57ca319
Sorry, Bryan's right, it is on stable. Moving back to testing. Jordi, are you testing against the current tip of stable? Fix didn't appear in the main repo until a couple hours ago. (It's probably better to let hgbot automatically mark the bug for testing when it appears in main to avoid "where's the fix?" confusion.)
Moving back to testing as we have a conflicting report.
Fixed fix: http://hg.intevation.org/mercurial/crew/rev/a45b33f12627 This one verifies the octave repo cleanly.
> This one verifies the octave repo cleanly. yep, confirmed