Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-double-merge @ 5338:f87685355c9c
revlog: fix revlogio.packentry corner case
We want to store version information about the revlog in the first
entry of its index. The code in packentry was using some heuristics
to detect whether this was the first entry, but these heuristics could
fail in some cases (e.g. rev 0 was empty; rev 1 descends directly from
the nullid and is stored as a delta).
We now give the revision number to packentry to avoid heuristics.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Wed, 26 Sep 2007 01:58:45 -0300 |
parents | 99a4592ea886 |
children |
line wrap: on
line source
#!/bin/sh hg init repo cd repo echo line 1 > foo hg ci -qAm 'add foo' -d "1000000 0" # copy foo to bar and change both files hg cp foo bar echo line 2-1 >> foo echo line 2-2 >> bar hg ci -m 'cp foo bar; change both' -d "1000000 0" # in another branch, change foo in a way that doesn't conflict with # the other changes hg up -qC 0 echo line 0 > foo hg cat foo >> foo hg ci -m 'change foo' -d "1000000 0" # we get conflicts that shouldn't be there hg merge --debug echo "-- foo --" cat foo echo "-- bar --" cat bar