[PATCH 2 of 2] Fix income/pull with bundle and -R (issue 820)

[Peter Arrenbrecht]

Strange, as I'm on Ubuntu myself. Shall look into it.
-peter

On Dec 19, 2007 6:51 PM, Jesse Glick <Jesse.Glick at sun.com> wrote:
> Peter Arrenbrecht wrote:
> > # HG changeset patch
> > # User Peter Arrenbrecht <peter.arrenbrecht at gmail.com>
> > # Date 1194075690 -3600
> > # Node ID f84748580cf66c201b6fefd94067b5b46c284cbb
> > # Parent  b836258f7ad578432d621e298912f610c55c8633
> > Fix income/pull with bundle and -R (issue 820).
> >
> > diff --git a/tests/test-mq-pull-from-bundle b/tests/test-mq-pull-from-bundle
> > +#!/bin/sh
> > +
> > +echo "[extensions]" >> $HGRCPATH
> > +echo "mq=" >> $HGRCPATH
> > +echo "[defaults]" >> $HGRCPATH
> > +echo "log = --template \"{rev}: {desc}\\\n\"" >> $HGRCPATH
> > +echo "heads = --template \"{rev}: {desc}\\\n\"" >> $HGRCPATH
> > +echo "incoming = --template \"{rev}: {desc}\\\n\"" >> $HGRCPATH
> > +
> > +echo "====== .hgrc"
>
> Running Ubuntu, I get a test failure from this (da72b4d24797 in
> http://selenic.com/repo/hg):
>
> ERROR: test-mq-pull-from-bundle output changed
> --- Expected output
> +++ Test output
> @@ -9,60 +9,174 @@
>   [extensions]
>   mq=
>   [defaults]
> -log = --template "{rev}: {desc}\n"
> -heads = --template "{rev}: {desc}\n"
> -incoming = --template "{rev}: {desc}\n"
> +log = --template "{rev}: {desc}
> +"
> +heads = --template "{rev}: {desc}
> +"
> +incoming = --template "{rev}: {desc}
> +"
>   ====== Setup main
> -adding one
> +abort: Failed to parse /tmp/hgtests.Dnq33b/.hgrc
> +File contains parsing errors: /tmp/hgtests.Dnq33b/.hgrc
> +       [line 12]: '"\n'
> +       [line 14]: '"\n'
> +       [line 16]: '"\n'
> +cd: 15: can't cd to base
> +abort: Failed to parse /tmp/hgtests.Dnq33b/.hgrc
> [....more....]
>
> --
> jesse.glick at sun.com  netbeans.org  ant.apache.org  hudson.dev.java.net
>              http://google.com/search?q=e%5E%28pi*i%29%2B1
>