I've only played around with this a bit, but it looks to be doing the
right thing.
In practice, I think the normal workflow tends to be 'rebase, submit'
and so this code path will only be taken in the case where a conflicting
change is submitted to p4 in the window between rebasing and submitt
If a commit fails to apply cleanly to the p4 tree, an interactive
prompt asks what to do next. In all cases (skip, apply, write),
the behavior after the prompt had a few problems.
Change it so that it does not claim erroneously that all commits
were applied. Instead list the set of the patches u
2 matches
Mail list logo