Parent Directory | Revision Log
|Links to HEAD:||(view) (annotate)|
|Links to mcvs-0-10:||(view) (annotate)|
* branch.lisp (what-module-is-this): New function. (cvs-make-or-advance-tag): Use rtag rather than tag for tagging the branch being merged. This fixes the failure to merge added files. (mcvs-merge): Use mcvs-update rather than directly using cvs.
Implemented remerge command; redo a merge without moving around any tags. * branch.lisp (mcvs-merge): New keyword parameter remerge-p to indicate that a re-merge should be done, plus logic for doing so. (mcvs-remerge-wrapper): New function. * mcvs-main.lisp (*remerge-options*): New constant. (*mcvs-command-table*): New entry for remerge command.
Use more human readable symbols for tracking merges.
First cut at implementing more automated branching and merging. * mcvs-main.lisp (*branch-options*, *merge-options*): New constants. (*mcvs-command-table*): New entries for branch and merge commands. (*usage*): New help text. * branch.lisp: New file. (*branch-char*): New constant. (tags-from-cvs-log, what-branch-are-we-on, branch-tag-check, mcvs-branch, mcvs-branch-wrapper, cvs-make-or-advance-tag, mcvs-merge, mcvs-merge-wrapper): New functions.
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, select a symbolic revision name using the selection box, or choose 'Use Text Field' and enter a numeric revision.
|Powered by ViewVC 1.1.5|