Differences between revisions 10 and 12 (spanning 2 versions)
Revision 10 as of 2007-08-04 17:55:29
Size: 1319
Editor: BrendanCully
Comment: some notes on rerere
Revision 12 as of 2007-08-08 03:01:37
Size: 409
Editor: 220
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.
Line 18: Line 16:
 * automatic resolution of previously handled merge conflicts, cf git-rerere. plan of sorts:
   To apply a recorded resolution:
   1. Perform simplemerge to discover conflict blocks
   2. For each conflict block with a recorded resolution, apply that resolution to LOCAL and OTHER.
   3. Discard the merge result and pass the modified LOCAL and OTHER to the regular merge process.
   4. Keep a record of the conflict blocks generated at step 1, for caching new resolutions.
 * automatic resolution of previously handled merge conflicts, cf git-rerere

Projects:

Extensions:

Todo:

  • Mq: add a qrebase command to wrap qsave -e c; qpush -a -m
  • Transplant: Support merge transplants. Use original second parent?
  • automatic resolution of previously handled merge conflicts, cf git-rerere

BrendanCully (last edited 2012-11-06 08:56:23 by mpm)