threads / discuss / 5574

stg pop/push -a nitpick: not handling deleted files

Subject: stg pop/push -a nitpick: not handling deleted files

## tl;dr

2 messages between Sep 15, 2006 and Sep 15, 2006.

replies: 1people: 2as markdown or json

Auke Kok· Sep 15, 2006, 17:19 UTC · lore

Hi,

minor nitpick when working with a patch that deletes a file: stg does not handle the 'abandoned' file when popping all patches off - essentially it would have to put the file back over an abandoned file.

I'm not sure what the resolution of this would be, but this problem could very well be anticipated (after all I just pushed/imported a patch removing the file to the stack).

Cheers,

Auke

$ stg pop -a Popping "all_git_versions.patch" - "all_copyright_update.patch" patches...fatal: Untracked working tree file 'drivers/net/e1000/LICENSE' would be overwritten by merge. stg pop: git-read-tree failed (local changes maybe?)

Catalin Marinas· Sep 15, 2006, 21:41 UTC · re: Auke Kok · lore

Re: stg pop/push -a nitpick: not handling deleted files

Auke Kok <auke-jan.h.kok@intel.com> wrote:

> minor nitpick when working with a patch that deletes a file: stg does
> not handle the 'abandoned' file when popping all patches off -
> essentially it would have to put the file back over an abandoned file.

[...]

Show 5 quoted lines

> $ stg pop -a
> Popping "all_git_versions.patch" - "all_copyright_update.patch"
> patches...fatal: Untracked working tree file
> 'drivers/net/e1000/LICENSE' would be overwritten by merge.
> stg pop: git-read-tree failed (local changes maybe?)

I don't think it's an StGIT-specific issue, git-read-tree failed to switch the working tree from one commit to another because a file would be overwritten. It is probably safer to fail in this situation.

-- 
Catalin