author | Thomas Arendsen Hein <thomas@intevation.de> |
Fri, 29 Jul 2005 15:11:34 +0100 | |
changeset 799 | 583e290e4945 |
parent 767 | 61ed30e82b27 |
child 801 | 1f9ec150a476 |
child 808 | 8f5637f0a0c0 |
child 814 | 0902ffece4b4 |
permissions | -rw-r--r-- |
+ mkdir t + cd t + hg init + echo This is file a1 + echo This is file b1 + hg add a b + hg commit -m 'commit #0' -d '0 0' + echo This is file b22 + hg commit '-mcomment #1' -d '0 0' + hg update 0 + rm b + hg commit -A '-mcomment #2' -d '0 0' removing b + yes k + hg update 1 this update spans a branch affecting the following files: b aborting update spanning branches! (use update -m to perform a branch merge) + exit 0