You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Is your feature request related to a problem? Please describe.
I am using the megamerge worklow with some local-only and some public changes on parallel branches. I have a bookmark pointing to the local-only change so I can refer to it easily. I would like to jj git push my other bookmark(s) with the public changes, but jj hard-errors on the one bookmark with local changes.
Describe the solution you'd like
Only emit a warning with the list of bookmarks that weren't pushed, because they contain private commits. Still push the other bookmarks.
Describe alternatives you've considered
Maybe it's possible to configure a default push revset that excludes any bookmarks that contain private commits? I wouldn't know how to do that though.
I might also be holding it wrong™, please tell me if you have a different workflow for working with local-only and public changes in parallel, without running into this problem.
Additional context
repro steps:
# init temp repo with some remote
jj new -m a -r 'root()'; jj bookmark create a --to @
jj new -m b -r 'root()'; jj bookmark create b --to @
jj config set --repo "git.private-commits"'"description(\'b\')"'jj new a bjj git push
The text was updated successfully, but these errors were encountered:
Is your feature request related to a problem? Please describe.
I am using the megamerge worklow with some local-only and some public changes on parallel branches. I have a bookmark pointing to the local-only change so I can refer to it easily. I would like to
jj git push
my other bookmark(s) with the public changes, but jj hard-errors on the one bookmark with local changes.Describe the solution you'd like
Only emit a warning with the list of bookmarks that weren't pushed, because they contain private commits. Still push the other bookmarks.
Describe alternatives you've considered
Maybe it's possible to configure a default push revset that excludes any bookmarks that contain private commits? I wouldn't know how to do that though.
I might also be holding it wrong™, please tell me if you have a different workflow for working with local-only and public changes in parallel, without running into this problem.
Additional context
repro steps:
The text was updated successfully, but these errors were encountered: