threads / bug / 4101

stgit bug: pulling file deletion patch leaves copy of file

Subject: stgit bug: pulling file deletion patch leaves copy of file

## tl;dr

2 messages between May 8, 2006 and May 8, 2006.

replies: 1people: 2as markdown or json

Karl Hasselström· May 8, 2006, 12:41 UTC · lore

When I pull (with -m) a branch that has accepted a patch of mine which deletes a file, stgit does the right thing wrt detecting the applied patch, etc. But it leaves an untracked copy of the deleted file in my working directory, which I get to delete.

I suspect this file should be deleted -- but isn't -- by the patch merge detection code that undoes the application of the reverse of my patch.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle

Catalin Marinas· May 8, 2006, 14:26 UTC · re: Karl Hasselström · lore

Re: stgit bug: pulling file deletion patch leaves copy of file

On 08/05/06, Karl Hasselström <kha@treskal.com> wrote:

> When I pull (with -m) a branch that has accepted a patch of mine which
> deletes a file, stgit does the right thing wrt detecting the applied
> patch, etc. But it leaves an untracked copy of the deleted file in my
> working directory, which I get to delete.

Indeed, it should but it doesn't. The file is generated while reverse-applying the patches but the git.reset() function (which calls git.checkout()) doesn't remove the file. I'll fix it and push the changes tonight.

Thanks.

-- Catalin