{"thread":{"id":"886","subject":"Lost uncommitted changes and cogito","startedAt":"2005-06-09T19:23:00Z","lastAt":"2005-06-10T16:20:27Z","messageCount":3,"participants":["Jon Smirl","Chris Wedgwood"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"4799","messageId":"9e473391050609122372080863@mail.gmail.com","threadId":"886","inReplyTo":null,"subject":"Lost uncommitted changes and cogito","fromName":"Jon Smirl","fromEmail":"jonsmirl@gmail.com","sentAt":"2005-06-09T19:23:00Z","receivedAt":"2005-06-09T19:23:00Z","isPatch":false,"sender":{"key":"jonsmirl@gmail.com","avatar":"https://gravatar.com/avatar/cff3bf5bfdfa6708b905712ff91f0f9b8aaca161659f38c02b787920d5d28b7e?d=mp&s=160"},"body":"Uning current updated cogito I have three trees:\n\nlinus\nlinux-good \nlinux-merge\n\nlinux-merge had uncommitted changes\n\n>From linus I did cg update which pulled from linus.\nFrom linux-merge I did cg update which pulled from linus.\n\nAt this point the uncommitted changes in linux-merge were fine. \n\nThen I wasn't thinking and did cg update linux-good from linux-merge.\nlinux-merge was already update to date with linux-good since there\nwere no changes to linux-good pending. Doing that update created an\nempty commit and also lost my uncommitted changes. Shouldn't that have\njust done nothing?\n\n>From first update in linux-merge:\nApplying changes...\ndrivers/char/drm/Kconfig: locally modified\ndrivers/char/drm/drm_drv.c: locally modified\ndrivers/char/drm/radeon_drv.c: locally modified\ndrivers/char/drm/radeon_drv.h: locally modified\ndrivers/video/aty/radeon_base.c: locally modified\nMerging 35d1bc90546d1f0af198886ae8062a550142d926 ->\ncf380ee7308db0f067ceb2ae8b852838788bf453\n        to 4952d9aaa928e711b0cd40c6a6d48b73544b88f0...\n\nCommitted as 941cc5f620f6f4827885bc3f03519416bd9461ab.\n[jonsmirl@jonsmirl linux-merge]$ make\n\n>From second - local changes are gone.\nApplying changes...\nMerging cf380ee7308db0f067ceb2ae8b852838788bf453 ->\na7db5e4f33e72569936af357084e31305fab6618\n        to 941cc5f620f6f4827885bc3f03519416bd9461ab...\n\nCommitted as b0165eea961c7f2809a0aaabae7904a3a766ee05.\n[jonsmirl@jonsmirl linux-merge]$ make\n\n\n-- \nJon Smirl\njonsmirl@gmail.com\n"},{"id":"4813","messageId":"9e4733910506091728761275d7@mail.gmail.com","threadId":"886","inReplyTo":"9e473391050609122372080863@mail.gmail.com","subject":"Re: Lost uncommitted changes and cogito","fromName":"Jon Smirl","fromEmail":"jonsmirl@gmail.com","sentAt":"2005-06-10T00:28:25Z","receivedAt":"2005-06-10T00:28:25Z","isPatch":false,"sender":{"key":"jonsmirl@gmail.com","avatar":"https://gravatar.com/avatar/cff3bf5bfdfa6708b905712ff91f0f9b8aaca161659f38c02b787920d5d28b7e?d=mp&s=160"},"body":"After experimenting for a while it looks like any cg update to a\nbranch that the repository wasn't initially cloned from will lose the\npending uncomitted changes.\n\n-- \nJon Smirl\njonsmirl@gmail.com\n"},{"id":"4823","messageId":"059176.ed2e86bb7f91c5a63977e0fe2c7a5cac.ANY@taniwha.stupidest.org","threadId":"886","inReplyTo":"9e4733910506091728761275d7@mail.gmail.com","subject":"Re: Lost uncommitted changes and cogito","fromName":"Chris Wedgwood","fromEmail":"cw@f00f.org","sentAt":"2005-06-10T16:20:27Z","receivedAt":"2005-06-10T16:20:27Z","isPatch":false,"sender":{"key":"cw@f00f.org","avatar":null},"body":"On Thu, Jun 09, 2005 at 08:28:25PM -0400, Jon Smirl wrote:\n\n> After experimenting for a while it looks like any cg update to a\n> branch that the repository wasn't initially cloned from will lose\n> the pending uncomitted changes.\n\nI've had my current working tree trashed too a few times so I more or\nless backup my tree before doing anything adventurous in case of\naccidents or bugs.\n\nI'd actually like to see checked out files being RO and needing some\nkind of explicit \"cg-edit <filename>\" or similar to frob them to RW so\nthat we can use the R/W status in order to determine what files are\nsafe to mess with.\n"}]}