Mercurial > hg
view tests/test-bisect @ 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 | 51776e50bc8c |
children | 6d904eb19c2a |
line wrap: on
line source
#!/bin/sh set -e echo % init hg init echo % committing changes count=0 echo > a while test $count -lt 32 ; do echo 'a' >> a test $count -eq 0 && hg add hg ci -m "msg $count" -d "$count 0" echo % committed changeset $count count=`expr $count + 1` done echo % log hg log echo % hg up -C hg up -C echo % bisect test hg bisect -r hg bisect -b hg bisect -g 1 hg bisect -g echo skip hg bisect -s hg bisect -g hg bisect -g hg bisect -b hg bisect -g echo % bisect reverse test hg bisect -r hg bisect -b null hg bisect -g tip hg bisect -g echo skip hg bisect -s hg bisect -g hg bisect -g hg bisect -b hg bisect -g hg bisect -r hg bisect -g tip hg bisect -b tip || echo error hg bisect -r hg bisect -g null hg bisect -bU tip hg id