annotate tests/test-revlog-packentry.out @ 6298:53cbb33e1269

normallookup: during merges, restore the state saved by remove
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 18 Mar 2008 04:07:39 -0300
parents f87685355c9c
children 4b0c9c674707
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5338
f87685355c9c revlog: fix revlogio.packentry corner case
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
1 adding foo
f87685355c9c revlog: fix revlogio.packentry corner case
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
2 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
f87685355c9c revlog: fix revlogio.packentry corner case
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
3 adding foo
f87685355c9c revlog: fix revlogio.packentry corner case
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
4 rev offset length base linkrev nodeid p1 p2
f87685355c9c revlog: fix revlogio.packentry corner case
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
5 0 0 0 0 0 b80de5d13875 000000000000 000000000000
f87685355c9c revlog: fix revlogio.packentry corner case
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
6 1 0 24 0 1 0376abec49b8 000000000000 000000000000