/[meta-cvs]/meta-cvs/F-58F396B2ADF675136DD8552C6FFD5310.lisp
ViewVC logotype

Log of /meta-cvs/F-58F396B2ADF675136DD8552C6FFD5310.lisp

Parent Directory Parent Directory | Revision Log Revision Log


Links to HEAD: (view) (annotate)
Links to deferred-adds-branch: (view) (annotate)
Sticky Tag:

Revision 1.9 - (view) (annotate) - [select for diffs]
Thu Apr 4 18:55:29 2002 UTC (12 years ago) by kaz
Branch: MAIN
CVS Tags: deferred-adds-branch~branch-point, mcvs-0-11
Branch point for: deferred-adds-branch
Changes since 1.8: +89 -56 lines
Diff to previous 1.8
New switch command added, plus sticky tag related
bugfixes and enhancement of mcvs list-branches.

mcvs-main.lisp (*switch-options*): New constant.
(*mcvs-command-table*): New entries.
(*usage*): New help text.

branch.lisp (what-branch-are-we-on): Function renamed to
what-tag-are-we-on. Tests the first letter which is T or N; if
it is not T, then it's not a branch tag. If there is a tag,
it returns two values; the second value is NIL if it is not
a branch tag, T otherwise.
(mcvs-merge): Modified to use what-tag-are-we-on.
(mcvs-list-branches): Show additional information about the
current sticky tag.
(mcvs-merge-wrapper): Fix wrong parenthesization introduced
earlier today.
(mcvs-switch-wrapper): New function.

Revision 1.8 - (view) (annotate) - [select for diffs]
Thu Apr 4 17:52:14 2002 UTC (12 years ago) by kaz
Branch: MAIN
Changes since 1.7: +5 -2 lines
Diff to previous 1.7
Branch listing command shows the current branch.

Revision 1.7 - (view) (annotate) - [select for diffs]
Thu Apr 4 16:58:50 2002 UTC (12 years ago) by kaz
Branch: MAIN
Changes since 1.6: +3 -1 lines
Diff to previous 1.6
* branch.lisp (branch-tag-check): Check reserved symbol HEAD.

Revision 1.6 - (view) (annotate) - [select for diffs]
Thu Apr 4 16:55:09 2002 UTC (12 years ago) by kaz
Branch: MAIN
Changes since 1.5: +26 -3 lines
Diff to previous 1.5
New command to list branches.

* mcvs-main.lisp (*list-branches-options*): New constant.
(*mcvs-command-table*): Entries for new command added.
(*usage*): Help text added.

* branch.lisp (mcvs-list-branches,
mcvs-list-branches-wrapper): New functions.

Revision 1.5 - (view) (annotate) - [select for diffs]
Wed Apr 3 21:52:55 2002 UTC (12 years ago) by kaz
Branch: MAIN
Changes since 1.4: +7 -2 lines
Diff to previous 1.4
* branch.lisp (where-is-the-repository): New function.
(cvs-make-or-advance-tag): Pass down CVSROOT to cvs rtag using
the -d global option.

Revision 1.4 - (view) (annotate) - [select for diffs]
Wed Apr 3 17:00:54 2002 UTC (12 years ago) by kaz
Branch: MAIN
CVS Tags: mcvs-0-10
Changes since 1.3: +15 -10 lines
Diff to previous 1.3
* 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.

Revision 1.3 - (view) (annotate) - [select for diffs]
Wed Apr 3 00:55:05 2002 UTC (12 years ago) by kaz
Branch: MAIN
Changes since 1.2: +29 -11 lines
Diff to previous 1.2
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.

Revision 1.2 - (view) (annotate) - [select for diffs]
Tue Apr 2 23:45:46 2002 UTC (12 years ago) by kaz
Branch: MAIN
Changes since 1.1: +8 -6 lines
Diff to previous 1.1
Use more human readable symbols for tracking merges.

Revision 1.1 - (view) (annotate) - [select for diffs]
Tue Apr 2 23:38:20 2002 UTC (12 years ago) by kaz
Branch: MAIN
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.

  Diffs between and
  Type of Diff should be a

Sort log by:

  ViewVC Help
Powered by ViewVC 1.1.5