Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emacs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
emacs
emacs
Commits
1e98637e
Commit
1e98637e
authored
Mar 07, 2001
by
Stefan Monnier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(cvs-parse-table): Add another ignored message.
parent
f5cd98c0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
1 deletion
+11
-1
lisp/pcvs-parse.el
lisp/pcvs-parse.el
+11
-1
No files found.
lisp/pcvs-parse.el
View file @
1e98637e
...
...
@@ -4,7 +4,7 @@
;; Author: Stefan Monnier <monnier@cs.yale.edu>
;; Keywords: pcl-cvs
;; Revision: $Id: pcvs-parse.el,v 1.
4 2000/12/06 19:52:39 fx
Exp $
;; Revision: $Id: pcvs-parse.el,v 1.
5 2000/12/18 03:17:31 monnier
Exp $
;; This file is part of GNU Emacs.
...
...
@@ -25,6 +25,12 @@
;;; Commentary:
;;; Bugs:
;; - when merging a modified file, if the merge says that the file already
;; contained in the changes, it marks the file as `up-to-date' although
;; it might still contain further changes.
;; Example: merging a zero-change commit.
;;; Code:
...
...
@@ -352,6 +358,8 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'."
(
cvs-match
"refetching unpatchable files$"
)
;; [commit]
(
cvs-match
"Rebuilding administrative file database$"
)
;; ???
(
cvs-match
"--> Using per-directory sticky tag `.*'"
)
;; CVS is running a *info program.
(
and
...
...
@@ -408,6 +416,8 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'."
"\\) already contains the differences between .*$"
)
(
path
1
)
(
type
'
(
UP-TO-DATE
.
MERGED
)))
t
)
;; FIXME: PATH might not be set yet. Sometimes the only path
;; information is in `RCS file: ...' (yuck!!).
(
cvs-parsed-fileinfo
(
if
dont-change-disc
'NEED-MERGE
(
or
type
'
(
MODIFIED
.
MERGED
)))
path
nil
:merge
(
cons
base-rev
head-rev
))))))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment