fix svn and bazaar failing to checkout in verbose mode #11051
Conversation
devsagul
force-pushed
the
fix/svn-fails-with-verbose
branch
2 times, most recently
from
0739542
to
4acbd04
Compare
devsagul
force-pushed
the
fix/svn-fails-with-verbose
branch
from
a00ded4
to
ea04e70
Compare
|
There is a a failing test: is it a flap? Should I somehow re-run it, or it can be related to the fact that timeout was not processed properly before and test failed because verbose checkouts failed and now I should fix it somehow? |
|
Yeah that does nto seem related. And it only fails on one Windows machine. Don’t worry about it (for this PR), that should be dealt separately. |
github-actions
bot
added
the
needs rebase or merge
|
Is there something missing here? The fix looks straight forward? |
I guess it should be planned for including into a release by a maintainer and than merged (it was never stated clearly). I will update the PR. |
devsagul
force-pushed
the
fix/svn-fails-with-verbose
branch
from
ea04e70
to
35c00c7
Compare
devsagul
force-pushed
the
fix/svn-fails-with-verbose
branch
from
35c00c7
to
79d29ec
Compare
devsagul
force-pushed
the
fix/svn-fails-with-verbose
branch
from
79d29ec
to
5c90afe
Compare
|
Sorry for the mess, haven't been using git for a while @uranusjr is there something I have to do in order to merge this fix? |
|
Thanks for the fix! |
devsagul
force-pushed
the
fix/svn-fails-with-verbose
branch
from
5c90afe
to
eb87664
Compare
|
Hang on, I thought I merged this? When I approved, there were separate tests for verbose and quiet modes, but these have gone now. Why did you remove them? For that matter, why are you still making changes after the PR was approved? |
Yeah, sorry, I just rebased that, it's better for me to leave it as is if you are going to merge it right away |
Didn't catch that, the diff is literally the same |
|
I think what I did was hit "Comment" rather than "Confirm merge". My bad. Sorry for the confusion. Also, while we don't have a policy on force pushes vs extra commits, I find it can be a lot harder to keep track of what's going on with force pushes. Maybe that's why I lost track of the verbose/quiet tests? Not sure. It's not a huge deal wither way. Anyway, as I said, thanks for the contribution. |
|
On that note, you've merged without squashing which is a bit unexpected tbh (and now there is my mess of four commits in the main branch; not all of them are valid), maybe something like a policy mentioned here would be nice. I mean, I would squash them myself if there was a policy on the way merging is done mentioned. Thanks! |
|
We don't squash merge, that's our normal practice. I thought it was documented, but maybe it isn't - if so, I'm sorry. Don't worry about the messy commit history, perfect commits is not something we particularly strive for. |
Closes: #11050