[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
cvs commit slipup -- sorry!
From: |
Kai Großjohann |
Subject: |
cvs commit slipup -- sorry! |
Date: |
29 Oct 2000 19:04:04 +0100 |
User-agent: |
Gnus/5.0808 (Gnus v5.8.8) Emacs/21.0.90 |
I accidentally committed lisp/cus-load.el, lisp/loaddefs.el,
lisp/time-stamp.el, and lisp/eshell/esh-groups.el. I didn't really
intend to do that. So for each of them, I did the following:
cvs update -p -r$REV $FILE > $FILE.new
mv $FILE.new $FILE
And then, I again did a commit. Here, $REV was the version before my
commit. And lastly, the following commands helped me to confirm that
the slipup was undone:
cvs diff -r1.24 -r1.26 lisp/cus-load.el
cvs diff -r2.33 -r2.35 lisp/loaddefs.el
cvs diff -r1.39 -r1.41 lisp/time-stamp.el
cvs diff -r1.3 -r1.5 lisp/eshell/esh-groups.el
I'm sorry that this happened (and I'm not really sure how it
happened), and I hope I did the right thing to undo my slipup.
Isn't loaddefs.el generated when running make? So maybe that file
shouldn't be in the repository at all? Same thing for cus-load.el?
I have now idea why my local copies of these files were marked as
changed.
Next time, I'll do a dry-run first. I promise!
kai
--
I like BOTH kinds of music.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- cvs commit slipup -- sorry!,
Kai Großjohann <=