{"thread":{"id":"1620","subject":"cg-update/cg-merge refuse to update if state is dirty?","startedAt":"2005-08-23T08:09:04Z","lastAt":"2005-08-23T14:22:21Z","messageCount":2,"participants":["Martin Langhoff","Carl Baldwin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"7645","messageId":"46a038f905082301096285a3cb@mail.gmail.com","threadId":"1620","inReplyTo":null,"subject":"cg-update/cg-merge refuse to update if state is dirty?","fromName":"Martin Langhoff","fromEmail":"martin.langhoff@gmail.com","sentAt":"2005-08-23T08:09:04Z","receivedAt":"2005-08-23T08:09:04Z","isPatch":false,"sender":{"key":"martin.langhoff@gmail.com","avatar":"https://gravatar.com/avatar/1e3f311b6c4c15836501901ca58f8c0b0667246488084ba524d8bc9867e22fd9?d=mp&s=160"},"body":"Should cg-update or cg-merge be refusing to merge if the tree is\ndirty? If there are uncommitted files, and the merge fails, a lot of\nunrelated changes will be dumped on the working tree, which ends up\nwith a mix of things.\n\ncheers,\n\n\nmartin\n"},{"id":"7650","messageId":"20050823142221.GA21663@hpsvcnb.fc.hp.com","threadId":"1620","inReplyTo":"46a038f905082301096285a3cb@mail.gmail.com","subject":"Re: cg-update/cg-merge refuse to update if state is dirty?","fromName":"Carl Baldwin","fromEmail":"cnb@fc.hp.com","sentAt":"2005-08-23T14:22:21Z","receivedAt":"2005-08-23T14:22:21Z","isPatch":false,"sender":{"key":"cnb@fc.hp.com","avatar":null},"body":"Hello,\n\nHere's a thought.  It might be nice, in this situation, to have\nsomething like a git-undo-script that can undo the changes in the index\nstoring them in a tree object but not wrapping them into a commit.  A\nref to the tree can be stored in an 'undo' file somewhere under .git.\nWhen the merge is done then a git-redo-script can retrieve and merge\nthat tree back into the index.  This way, cg-{merge,update} could refuse\n--- which I tend to think it should --- to merge into a dirty tree but\nit wouldn't be so inconvenient.\n\ncogito would handle synchronization with the working copy like normal.\n\nCarl\n\nOn Tue, Aug 23, 2005 at 08:09:04PM +1200, Martin Langhoff wrote:\n> Should cg-update or cg-merge be refusing to merge if the tree is\n> dirty? If there are uncommitted files, and the merge fails, a lot of\n> unrelated changes will be dumped on the working tree, which ends up\n> with a mix of things.\n> \n> cheers,\n> \n> \n> martin\n> -\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at  http://vger.kernel.org/majordomo-info.html\n> \n\n-- \n- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -\n Carl Baldwin                        Systems VLSI Laboratory\n Hewlett Packard Company\n MS 88                               work: 970 898-1523\n 3404 E. Harmony Rd.                 work: Carl.N.Baldwin@hp.com\n Fort Collins, CO 80525              home: Carl@ecBaldwin.net\n- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -\n"}]}