Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-patchbomb @ 4510:e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Rationale for not aborting instead:
The first parent is usually more important as it is the local branch
during a merge and commands like 'hg diff' and 'hg diff -r.' behave still
identically (except for the warning of course).
Added a test for log -r. with one and two parents.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 06 Jun 2007 19:05:18 +0200 |
parents | b0656b33cc02 |
children | 1cf908c00479 1e11e8b6acab |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "patchbomb=" >> $HGRCPATH hg init echo a > a hg commit -Ama -d '1 0' hg email --date '1970-1-1 0:1' -n -f quux -t foo -c bar tip | \ sed -e 's/\(Message-Id:.*@\).*/\1/' echo b > b hg commit -Amb -d '2 0' hg email --date '1970-1-1 0:2' -n -f quux -t foo -c bar -s test 0:tip | \ sed -e 's/\(Message-Id:.*@\|In-Reply-To:.*@\).*/\1/'