Mercurial > hg
view tests/test-churn @ 6375:cdc458b12f0f
update: better logic and messages for updates
- complain about attempts to merge with ancestor
- when updating, differentiate between
- crossing named branches with no local changes (jump)
- crossing named branches with local changes (complain)
- nonlinear update on the same named branch, no changes (complain some more)
- nonlinear update on the same named branch, changes (different complaining)
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 24 Mar 2008 10:01:05 -0500 |
parents | f8feaa665319 |
children | 78a17b77c5e7 |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "churn=" >> $HGRCPATH echo % create test repository hg init repo cd repo echo a > a hg ci -Am adda -u user1 echo b >> a echo b > b hg ci -Am addb -u user2 echo c >> a echo c >> b echo c > c hg ci -Am addc -u user3 echo % churn all hg churn echo % churn up to rev 1 hg churn -r :1 echo % churn with aliases cat > ../aliases <<EOF user1 alias1 user3 alias3 EOF hg churn --aliases ../aliases echo % churn with column specifier COLUMNS=40 hg churn