|
Size: 913
Comment: more notes on a qrebase command
|
Size: 917
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 15: | Line 15: |
| * qrebase [rev]: reapply the currently applied patches to rev (defaulting to the tip of the current branch). Update to rev, and attempt to apply each patch. If apply fails, perform a three-way merge with the original patch changeset, its ancestor, and the current rev. One way to perhaps cut down on the extraneous 3-way merge garbage might be to attempt to bisect between rev and the original revv for the last place where the patch can be successfully applied, then use that as the merge other end. | * qrebase [rev]: reapply the currently applied patches to rev (defaulting to the tip of the current branch). Update to rev, and attempt to apply each patch. If apply fails, perform a three-way merge with the original patch changeset, its ancestor, and the current rev. One way to perhaps cut down on the extraneous 3-way merge garbage might be to attempt to bisect between rev and the original revv for the last place where the patch can be successfully applied, then use that as the merge other end. |
Projects:
Extensions:
Todo:
- Mq: add a qrebase command to wrap qsave -e c; qpush -a -m
- qrebase [rev]: reapply the currently applied patches to rev (defaulting to the tip of the current branch).
- Update to rev, and attempt to apply each patch. If apply fails, perform a three-way merge with the original patch changeset, its ancestor, and the current rev. One way to perhaps cut down on the extraneous 3-way merge garbage might be to attempt to bisect between rev and the original revv for the last place where the patch can be successfully applied, then use that as the merge other end.
- qrebase [rev]: reapply the currently applied patches to rev (defaulting to the tip of the current branch).
- Transplant: Support merge transplants. Use original second parent?
- automatic resolution of previously handled merge conflicts, cf git-rerere