Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 815:5a55e3011772
Psyco was failing to call dirstate.__del__ for import
Remove it.
author | mpm@selenic.com |
---|---|
date | Sat, 30 Jul 2005 09:01:59 -0800 |
parents | 0902ffece4b4 |
children | 77e121a0d870 0932bc2fb2be 1fe3b14c7044 |
line wrap: on
line source
+ hg init + hg add a b + hg commit -m commit #0 -d 0 0 + hg commit -mcomment #1 -d 0 0 + hg update 0 + hg commit -A -mcomment #2 -d 0 0 removing b + 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)