Hi Kwankyu, On 2019-09-27, Kwankyu Lee <ekwan...@gmail.com> wrote: >> I am not totally sure if that's what was happening. Would git really >> allow the "git branch -d" operation when another worktree is on that >> branch? >> > > If you were at foobar in py3 worktree and at develop in py2 worktree, no.
Then what else has happened? According to my bash history, this is basically what I did: - I was on foobar branch in my py3 worktree. Foobar is in fact the same as the branch from trac ticket #28444. - I went to my py2 worktree and checked out "develop". After "git pull", I realised that "foobar" already is merged in "develop". - Still in the py2 worktree, I went to some branch "baz", which is a few commits ahead of foobar, and at that point was the branch of trac ticket #28414. - Since foobar was in develop, I did "git branch -d foobar", still in the py2 worktree. It worked without complaints. Note: It was "-d", not "-D". - Still in py2 worktree, I rebased "baz" on top of "develop", and force-pushed it to trac ticket #28414. - I went to my py3 worktree, did "git status", got some hundreds of pages of output, although I didn't edit any file since my last visit of the py3 worktree. I tried "git checkout develop", which failed, because git told me to first commit or stash my changes. I did "git log", which told me that there were absolutely no commits yet. >> Can you please tell me how to recover from that mess? > > > Why not just add a new shiny py3 worktree and move your untracked files > from the old py3 worktree to the new one? My hope was that I can somehow recover from the mess without rebuilding all of sage-on-py3. Plus, in "reality" (from my perspective, "reality" is the opposite to "git history") there are no untracked files. The files in my py3 worktree are physically the same as those from the git branch from #28444, that is still available in my py2 worktree. That's why I thought "git checkout -f develop" in the py3 worktree might help. But perhaps after that I'd need to rebuild Sage from scratch, too? Anyway, before trying a forced operation: Would it potentially create even more mess? Best regards, Simon -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/sage-devel/qmmucg%244e2a%241%40blaine.gmane.org.
