{"thread":{"id":"4101","subject":"stgit bug: pulling file deletion patch leaves copy of file","startedAt":"2006-05-08T12:41:27Z","lastAt":"2006-05-08T14:26:04Z","messageCount":2,"participants":["Karl Hasselström","Catalin Marinas"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"19711","messageId":"20060508124127.GA30662@diana.vm.bytemark.co.uk","threadId":"4101","inReplyTo":null,"subject":"stgit bug: pulling file deletion patch leaves copy of file","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2006-05-08T12:41:27Z","receivedAt":"2006-05-08T12:41:27Z","isPatch":false,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"When I pull (with -m) a branch that has accepted a patch of mine which\ndeletes a file, stgit does the right thing wrt detecting the applied\npatch, etc. But it leaves an untracked copy of the deleted file in my\nworking directory, which I get to delete.\n\nI suspect this file should be deleted -- but isn't -- by the patch\nmerge detection code that undoes the application of the reverse of my\npatch.\n\n-- \nKarl Hasselström, kha@treskal.com\n      www.treskal.com/kalle\n"},{"id":"19712","messageId":"b0943d9e0605080726n75fd1e9avc48b7b932774d9ea@mail.gmail.com","threadId":"4101","inReplyTo":"20060508124127.GA30662@diana.vm.bytemark.co.uk","subject":"Re: stgit bug: pulling file deletion patch leaves copy of file","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@gmail.com","sentAt":"2006-05-08T14:26:04Z","receivedAt":"2006-05-08T14:26:04Z","isPatch":false,"sender":{"key":"catalin.marinas@gmail.com","avatar":null},"body":"On 08/05/06, Karl Hasselström <kha@treskal.com> wrote:\n> When I pull (with -m) a branch that has accepted a patch of mine which\n> deletes a file, stgit does the right thing wrt detecting the applied\n> patch, etc. But it leaves an untracked copy of the deleted file in my\n> working directory, which I get to delete.\n\nIndeed, it should but it doesn't. The file is generated while\nreverse-applying the patches but the git.reset() function (which calls\ngit.checkout()) doesn't remove the file. I'll fix it and push the\nchanges tonight.\n\nThanks.\n\n--\nCatalin\n"}]}