Hello, Here's a thought. It might be nice, in this situation, to have something like a git-undo-script that can undo the changes in the index storing them in a tree object but not wrapping them into a commit. A ref to the tree can be stored in an 'undo' file somewhere under .git. When the merge is done then a git-redo-script can retrieve and merge that tree back into the index. This way, cg-{merge,update} could refuse --- which I tend to think it should --- to merge into a dirty tree but it wouldn't be so inconvenient.
cogito would handle synchronization with the working copy like normal. Carl On Tue, Aug 23, 2005 at 08:09:04PM +1200, Martin Langhoff wrote: > Should cg-update or cg-merge be refusing to merge if the tree is > dirty? If there are uncommitted files, and the merge fails, a lot of > unrelated changes will be dumped on the working tree, which ends up > with a mix of things. > > cheers, > > > martin > - > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to [EMAIL PROTECTED] > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Carl Baldwin Systems VLSI Laboratory Hewlett Packard Company MS 88 work: 970 898-1523 3404 E. Harmony Rd. work: [EMAIL PROTECTED] Fort Collins, CO 80525 home: [EMAIL PROTECTED] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html