Mercurial > hg
annotate tests/test-revlog-packentry.out @ 7821:9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Fixes issue1533.
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Wed, 04 Mar 2009 13:06:16 -0600 |
parents | 4b0c9c674707 |
children |
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 |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
5338
diff
changeset
|
4 created new head |
5338
f87685355c9c
revlog: fix revlogio.packentry corner case
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
5 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
|
6 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
|
7 1 0 24 0 1 0376abec49b8 000000000000 000000000000 |