view tests/test-manifest-merging @ 11150:f66ca4431eb9

patchbomb: Reply-To support

From RFC 5322:
  an optional reply-to field MAY also be included, which contains the field
  name "Reply-To" and a comma-separated list of one or more addresses.
  [...]
  When the "Reply-To:" field is present, it indicates the address(es) to which
  the author of the message suggests that replies be sent.  In the absence of
  the "Reply-To:" field, replies SHOULD by default be sent to the mailbox(es)
  specified in the "From:" field unless otherwise specified by the person
  composing the reply.

Reply-To addresses may be specified either via command line with --reply-to
or via the 'email' or 'patchbomb' sections of the config file.

#!/bin/sh

echo % init foo-base
hg init foo-base

echo % create alpha in first repo
cd foo-base
echo 'alpha' > alpha
hg ci -A -m 'add alpha' -d '1 0'
cd ..

echo % clone foo-base to foo-work
hg clone foo-base foo-work

echo % create beta in second repo
cd foo-work
echo 'beta' > beta
hg ci -A -m 'add beta' -d '2 0'
cd ..

echo % create gamma in first repo
cd foo-base
echo 'gamma' > gamma
hg ci -A -m 'add gamma' -d '3 0'
cd ..

echo % pull into work and merge
cd foo-work
hg pull -q
hg merge

echo % revert to changeset 1 to simulate a failed merge
rm alpha beta gamma
hg up -C 1