Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge2.out @ 602:56d81b303656
Various HTML cleanups
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Various HTML cleanups
From: Edouard Gomez <ed.gomez@free.fr>
Cleaned up the changeset summary table differentiating title cells
from data cells using th and td. Added semantic classes.
Changed the big pre tag into a div that mimics pre tag style
(that is monospace font and white space preformated). This is
required because pre is an inline element, and thus cannot
be the parent of block elements as div (diffblock). I replaced
all these div blocks by a series ul lists as patches can be
seen as lists of changes in versioned files.
If someone has a better semantic to propose, i'd be pleased he
drops me an email about this patch.
- --
Cleaned up the filediff summary table differentiating title cells
from data cells using th and td. Added semantic classes.
- --
Keep style unchanged for changeset template
As promised no changes in style. This one got through my eyes
+ brain checking... sorry.
manifest hash: 68dd5c1ac71aa6a5932fb209d48df5fc0c78643b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyLwfywK+sNU5EO8RAtE9AJ0cxl80eF3zpBWLn8OkoSs7dkZOTgCgtYto
j7T/iRk0Hq4Q0mjdos7FvYU=
=KOP2
-----END PGP SIGNATURE-----
| author | mpm@selenic.com |
|---|---|
| date | Sun, 03 Jul 2005 20:33:35 -0800 |
| parents | feadc9697b43 |
| children | 7e4843b7efd2 |
| rev | line source |
|---|---|
| 409 | 1 + mkdir t |
| 2 + cd t | |
| 3 + hg init | |
| 4 + echo This is file a1 | |
| 5 + hg add a | |
| 6 + hg commit -t 'commit #0' -d '0 0' -u user | |
| 7 + echo This is file b1 | |
| 8 + hg add b | |
| 9 + hg commit -t 'commit #1' -d '0 0' -u user | |
| 10 + rm b | |
| 11 + hg update 0 | |
| 12 + echo This is file b2 | |
| 13 + hg add b | |
| 14 + hg commit -t 'commit #2' -d '0 0' -u user | |
| 15 + cd .. | |
| 16 + /bin/rm -rf t | |
| 17 + mkdir t | |
| 18 + cd t | |
| 19 + hg init | |
| 20 + echo This is file a1 | |
| 21 + hg add a | |
| 22 + hg commit -t 'commit #0' -d '0 0' -u user | |
| 23 + echo This is file b1 | |
| 24 + hg add b | |
| 25 + hg commit -t 'commit #1' -d '0 0' -u user | |
| 26 + rm b | |
| 27 + hg update 0 | |
| 28 + echo This is file b2 | |
| 29 + hg commit -A -t 'commit #2' -d '0 0' -u user | |
| 30 + cd .. | |
| 31 + /bin/rm -rf t | |
| 32 + mkdir t | |
| 33 + cd t | |
| 34 + hg init | |
| 35 + echo This is file a1 | |
| 36 + hg add a | |
| 37 + hg commit -t 'commit #0' -d '0 0' -u user | |
| 38 + echo This is file b1 | |
| 39 + hg add b | |
| 40 + hg commit -t 'commit #1' -d '0 0' -u user | |
| 41 + rm b | |
| 42 + hg remove b | |
| 43 + hg update 0 | |
| 44 + echo This is file b2 | |
| 45 + hg commit -A -t 'commit #2' -d '0 0' -u user | |
| 46 + cd .. | |
| 47 + /bin/rm -rf t |