Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge6 @ 661:148f642d1f8e
Add rss tag in the changelog/filelog html template.
# HG changeset patch
# User kreijack@inwind.REMOVEME.it
# Node ID 20edcc82038fce8460076ca5723fbbb919016356
# Parent 8c89408a7154d2da94766e957a088407fd0fef93
Add rss tag in the changelog/filelog html template.
This patch add rss tags in the changelog/filelog template
html pages. This tags permit the browser to detect the rss feed.
author | kreijack@inwind.REMOVEME.it |
---|---|
date | Sun, 10 Jul 2005 15:59:26 -0800 |
parents | d96c1153b25d |
children | 7e4843b7efd2 |
line wrap: on
line source
#!/bin/sh -x cat <<'EOF' > merge #!/bin/sh echo merging for `basename $1` EOF chmod +x merge export HGMERGE=./merge mkdir A1 cd A1 hg init echo This is file foo1 > foo echo This is file bar1 > bar hg add foo bar hg commit -t "commit text" -d "0 0" -u user cd .. hg clone A1 B1 cd A1 rm bar hg remove bar hg commit -t "commit test" -d "0 0" -u user cd ../B1 echo This is file foo22 > foo hg commit -t "commit test" -d "0 0" -u user cd .. hg clone A1 A2 hg clone B1 B2 cd A1 hg pull ../B1 hg update -m hg commit -t "commit test" -d "0 0" -u user echo bar should remain deleted. hg manifest cd ../B2 hg pull ../A2 hg update -m hg commit -t "commit test" -d "0 0" -u user echo bar should remain deleted. hg manifest