{"thread":{"id":"5574","subject":"stg pop/push -a nitpick: not handling deleted files","startedAt":"2006-09-15T17:19:40Z","lastAt":"2006-09-15T21:41:09Z","messageCount":2,"participants":["Auke Kok","Catalin Marinas"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"26976","messageId":"450AE0AC.7060806@intel.com","threadId":"5574","inReplyTo":null,"subject":"stg pop/push -a nitpick: not handling deleted files","fromName":"Auke Kok","fromEmail":"auke-jan.h.kok@intel.com","sentAt":"2006-09-15T17:19:40Z","receivedAt":"2006-09-15T17:19:40Z","isPatch":false,"sender":{"key":"auke-jan.h.kok@intel.com","avatar":null},"body":"\nHi,\n\nminor nitpick when working with a patch that deletes a file: stg does not \nhandle the 'abandoned' file when popping all patches off - essentially it would \nhave to put the file back over an abandoned file.\n\nI'm not sure what the resolution of this would be, but this problem could very \nwell be anticipated (after all I just pushed/imported a patch removing the file \nto the stack).\n\nCheers,\n\nAuke\n\n\n\n$ stg pop -a\nPopping \"all_git_versions.patch\" - \"all_copyright_update.patch\" \npatches...fatal: Untracked working tree file 'drivers/net/e1000/LICENSE' would \nbe overwritten by merge.\nstg pop: git-read-tree failed (local changes maybe?)\n"},{"id":"26986","messageId":"tnxzmd03j0q.fsf@arm.com","threadId":"5574","inReplyTo":"450AE0AC.7060806@intel.com","subject":"Re: stg pop/push -a nitpick: not handling deleted files","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@arm.com","sentAt":"2006-09-15T21:41:09Z","receivedAt":"2006-09-15T21:41:09Z","isPatch":false,"sender":{"key":"catalin.marinas@arm.com","avatar":null},"body":"Auke Kok <auke-jan.h.kok@intel.com> wrote:\n> minor nitpick when working with a patch that deletes a file: stg does\n> not handle the 'abandoned' file when popping all patches off -\n> essentially it would have to put the file back over an abandoned file.\n[...]\n> $ stg pop -a\n> Popping \"all_git_versions.patch\" - \"all_copyright_update.patch\"\n> patches...fatal: Untracked working tree file\n> 'drivers/net/e1000/LICENSE' would be overwritten by merge.\n> stg pop: git-read-tree failed (local changes maybe?)\n\nI don't think it's an StGIT-specific issue, git-read-tree failed to\nswitch the working tree from one commit to another because a file\nwould be overwritten. It is probably safer to fail in this situation.\n\n-- \nCatalin\n"}]}