New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
RFE: "stg push --dry-run" versus "stg push --force" #60
Comments
Hi @chucklever. These are good questions and, I think, a common use case. Perhaps the missing piece in your workflow is I think that equipped with Regarding the possibility of changing the default behavior of If we were to add an option to |
I absolutely agree that "pushing then repairing" is a necessary function. I'm simply claiming that should not be the default behavior of "stg push", because:
So it seems like "stg push" should be transactional, and "stg push --force" (or something like it) should be used for the current "push then repair" behavior. And I realize that could be a significant and surprising workflow change for long-time stgit users such as myself. Note: I'm not being religious, just scratching my chin and squinting. I am happy to give "stg undo --hard" a try, and I would be happy with a dry-run behavior no matter what it is called. One alternative might be to add "--transactional" and "--force" options to "stg push", and then introduce a config option to make one or the other the default behavior. Or possibly I could create an alias for "stg push --no-conflict" and just use that alias every day. Thanks for your time and attention. |
I admit, Not sure I ever realized |
This discussion is really helpful. My takeaway is that
|
I like the addition of the enhanced conflict reports. |
I think I've got this reasonably fixed in d7322f6. For the behavior I think you want:
I've left the default behavior unchanged. |
If there's already a convenient way to do this, please let me know if I'm "doing it wrong". And apologies for being long-winded.
I frequently need to re-order patches in a series. I'm in the zone pushing and popping, and then suddenly I push a patch that doesn't apply cleanly and I realize I can't re-order the series that way without significant changes. But the workspace then needs to be cleaned up because it's full of conflicts, and the patch that didn't apply is now empty. It takes several minutes to hunt down the previous version of the patch, fix up the conflicts, and so on before I can get on with the original task. "stg undo" does not seem capable enough to make this painless (or perhaps I don't understand how to use it).
Instead, I'd like to propose possible tooling changes:
As always, thanks very much for your efforts!
The text was updated successfully, but these errors were encountered: