Mercurial > hg
view tests/test-empty-dir @ 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 | 33b6c8193652 |
children | 4c94b6d0fb1c |
line wrap: on
line source
#!/bin/sh hg init echo 123 > a hg add a hg commit -m "first" -d "1000000 0" a mkdir sub echo 321 > sub/b hg add sub/b hg commit -m "second" -d "1000000 0" sub/b cat sub/b hg co 0 cat sub/b 2>/dev/null || echo "sub/b not present" test -d sub || echo "sub not present" true