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

[Peter Arrenbrecht]

Matt, will this work for you?

diff --git a/tests/test-mq-pull-from-bundle b/tests/test-mq-pull-from-bundle
--- a/tests/test-mq-pull-from-bundle
+++ b/tests/test-mq-pull-from-bundle
@@ -1,11 +1,13 @@
 #!/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
+cat >> $HGRCPATH <<-"EOF"
+       [extensions]
+       mq=
+       [defaults]
+       log = --template "{rev}: {desc}\n"
+       heads = --template "{rev}: {desc}\n"
+       incoming = --template "{rev}: {desc}\n"
+EOF

 echo "====== .hgrc"
 cat $HGRCPATH

-peter

On Dec 20, 2007 8:57 AM, Matt Mackall <mpm at selenic.com> wrote:
> On Thu, Dec 20, 2007 at 08:25:34AM +0100, Peter Arrenbrecht wrote:
> > 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):
> > >
>
> I took a slash out to make it pass on Debian.
>
> --
>
> Mathematics is the supreme nostalgia of our time.
>