On Sat, Aug 27, 2011 at 2:09 AM, Dmitry Chestnykh <dmi...@codingrobots.com>wrote:
> Yeah, I haven't written code to alter stash and undo tables that already > exist in local _FOSSIL_ database with the new isLink column yet. If you > close and reopen repository, they'll be recreated. > Doh... that was a bad idea. My changes were in a branch, so my session went something like: ~> f close f: there are unsaved changes in the current checkout ~> f close --force ~> f open ... --keep and now my trunk has a mix of the former branch and the trunk, and the changes i wanted to stash are now merged with stuff from that branch which was in my checkout when i did 'fossil close'. This isn't a bug - i can see why/how it happened, but the moral of the story is: if you're gonna close/re-open, make sure you're at the trunk when you do it. What i was trying to do was stash uncommitted changes from the branch so that i could go back to the trunk. When stashing failed, a close left me with the branch's state + my uncommitted changes. A re-open brought me to the trunk, and my pre-commit state is such that the trunk thinks it contains all the changes from the branch. Doh. -- ----- stephan beal http://wanderinghorse.net/home/stephan/
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
