On 14/06/07, Yann Dirson <ydirson@xxxxxxxxxx> wrote:
When the parent branch is a rewinding one (eg. an stgit stack), then the old version of the patch will be turned to unreachable by pull/rebase, and we probably have even no way of telling stgit that it is indeed expected, since the parent stack is a local one. My own workflow on StGIT is affected by the issue, since my "bugs" stack is forked off my "master" stack (but hopefully an hydra will help me ;).
If I understand correctly, is this the case where you do a 'stg commit'? This command is meant for branches that are never rebased (i.e. my master stgit branch). For this branch one wouldn't have a remote branch configured and hence git fetch shouldn't do anything.
That makes me suspecting the reachability approach is a dead-end, and we should either get back to the approach of recording old-base, or find another solution.
Maybe defaulting to 'git pull' and only use 'git fetch' if explicitly asked. A git-pull would still keep the old patch accessible from HEAD. -- Catalin - 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
