Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-rawcommit1 @ 672:dbe0ce2ae196
More IE friendly diff output related templates.
# HG changeset patch
# User Edouard Gomez <ed.gomez@free.fr>
# Node ID 6eee9b54c53c41643192c7920db642c984a00a21
# Parent 8b8f710bb65875d588044c3615cf42180aee23ff
More IE friendly diff output related templates.
I thought i could use CSS to render properly the diff blocks in IE.
But i was obviously too optmistic and didn't realized that IE only
renders preformated text for pre tag content...
So i had to rollback some of my changes to accomodate to this IE
bug/limitation. A diff blocks become pre tags, and diff lines
become span again. Hopefully, the pages continue validating.
author | Edouard Gomez <ed.gomez@free.fr> |
---|---|
date | Sun, 10 Jul 2005 16:14:28 -0800 |
parents | eb46971fc57f |
children | 7e4843b7efd2 |
rev | line source |
---|---|
444 | 1 #!/bin/sh -x |
591 | 2 hg --debug init |
444 | 3 echo this is a1 > a |
591 | 4 hg add a |
5 hg commit -t0 -d "0 0" -u user | |
444 | 6 echo this is b1 > b |
591 | 7 hg add b |
8 hg commit -t1 -d "0 0" -u user | |
9 hg manifest 1 | |
444 | 10 echo this is c1 > c |
591 | 11 hg rawcommit -p 1 -d "0 0" -u user -t2 c |
12 hg manifest 2 | |
13 hg parents | |
444 | 14 rm b |
591 | 15 hg rawcommit -p 2 -d "0 0" -u user -t3 b |
16 hg manifest 3 | |
17 hg parents | |
444 | 18 echo this is a22 > a |
591 | 19 hg rawcommit -p 3 -d "0 0" -u user -t4 a |
20 hg manifest 4 | |
21 hg parents | |
444 | 22 echo this is c22 > c |
591 | 23 hg rawcommit -p 1 -d "0 0" -u user -t5 c |
24 hg manifest 5 | |
25 hg parents | |
444 | 26 # merge, but no files changed |
591 | 27 hg rawcommit -p 4 -p 5 -d "0 0" -u user -t6 |
28 hg manifest 6 | |
29 hg parents | |
444 | 30 # no changes what-so-ever |
591 | 31 hg rawcommit -p 6 -d "0 0" -u user -t7 |
32 hg manifest 7 | |
33 hg parents |