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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




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?)
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]