Bug 3665 - verify complains about spurious double slashes
Summary: verify complains about spurious double slashes
Status: VERIFIED FIXED
Alias: None
Product: Mercurial
Classification: Unclassified
Component: Mercurial (show other bugs)
Version: earlier
Hardware: All Linux
: normal bug
Assignee: Bugzilla
URL:
Keywords: easy
Depends on: 3612
Blocks:
  Show dependency tree
 
Reported: 2012-10-18 17:20 UTC by Matt Mackall
Modified: 2017-11-01 18:05 UTC (History)
6 users (show)

See Also:
Python Version: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Matt Mackall 2012-10-18 17:20 UTC
+++ 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?
Comment 1 Bryan O'Sullivan 2012-10-23 01:15 UTC
Fix: http://hg.intevation.org/mercurial/crew/rev/7aa7380691b8
Comment 2 Jordi Gutiérrez Hermoso 2012-10-23 15:14 UTC
Erm, is this really fixed? I still see trouble when running verify on the following repo:

http://hg.savannah.gnu.org/hgweb/octave/
Comment 3 Matt Mackall 2012-10-23 15:30 UTC
Fix went on default branch despite code freeze rules. I'll fix this in the near future.
Comment 4 Bryan O'Sullivan 2012-10-23 16:18 UTC
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.
Comment 5 Bryan O'Sullivan 2012-10-23 16:27 UTC
Just checked - it's on the stable branch in Matt's repo.

http://selenic.com/repo/hg/rev/1f34b57ca319
Comment 6 Matt Mackall 2012-10-23 17:09 UTC
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.)
Comment 7 Matt Mackall 2012-10-23 17:10 UTC
Moving back to testing as we have a conflicting report.
Comment 8 Bryan O'Sullivan 2012-10-24 12:42 UTC
Fixed fix: http://hg.intevation.org/mercurial/crew/rev/a45b33f12627

This one verifies the octave repo cleanly.
Comment 9 Jordi Gutiérrez Hermoso 2012-10-24 12:47 UTC
> This one verifies the octave repo cleanly.

yep, confirmed