view tests/test-interhg.t @ 13803:e380964d53f8

pull: don't suggest running hg merge when new heads are on different branches After a pull when new heads are added but no head is added on the current branch, the "run 'hg merge'" message can be misleading. This patch doesn't output the merge message in that scenario.
author Kevin Berridge <kevin.w.berridge@gmail.com>
date Fri, 11 Mar 2011 20:43:12 -0500
parents 779098953457
children c5c9ca3719f9
line wrap: on
line source

  $ hg init test
  $ cd test

  $ cat > .hg/hgrc <<EOF
  > [extensions]
  > interhg =
  > 
  > [interhg]
  > issues = s|Issue(\d+)|<a href="http://bts.example.org/issue\1">Issue\1</a>|
  > 
  > # yes, 'x' is a weird delimiter...
  > markbugs = sxbugx<i class="\x">bug</i>x
  > EOF

  $ touch foo
  $ hg add foo
  $ hg commit -d '1 0' -m 'Issue123: fixed the bug!'

  $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
  $ cat hg.pid >> $DAEMON_PIDS

log

  $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '/' | grep bts
    <td class="description"><a href="/rev/1b0e7ece6bd6"><a href="http://bts.example.org/issue123">Issue123</a>: fixed the <i class="x">bug</i>!</a><span class="branchhead">default</span> <span class="tag">tip</span> </td>

errors

  $ cat errors.log