summaryrefslogtreecommitdiff
path: root/admin/bzrmerge.el
Commit message (Collapse)AuthorAgeFilesLines
* * admin/bzrmerge.el: Remove file, long since replaced by gitmerge.el.Glenn Morris2018-10-301-359/+0
|
* Don't quote self-quoting pcase patternsMichael Heerdegen2018-10-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | * admin/bzrmerge.el: * lisp/char-fold.el: * lisp/dired.el: * lisp/emacs-lisp/derived.el: * lisp/emacs-lisp/easy-mmode.el: * lisp/emacs-lisp/easymenu.el: * lisp/emacs-lisp/eieio-core.el: * lisp/emacs-lisp/package.el: * lisp/emacs-lisp/smie.el: * lisp/faces.el: * lisp/filesets.el: * lisp/progmodes/modula2.el: * lisp/progmodes/octave.el: * lisp/progmodes/opascal.el: * lisp/progmodes/perl-mode.el: * lisp/progmodes/prolog.el: * lisp/progmodes/ruby-mode.el: * lisp/progmodes/sh-script.el: * lisp/server.el: * lisp/subr.el: * lisp/textmodes/css-mode.el: * test/lisp/emacs-lisp/pcase-tests.el: Don't quote self-quoting 'pcase' patterns.
* Update copyright year to 2018Paul Eggert2018-01-011-1/+1
| | | | Run admin/update-copyright.
* Prefer HTTPS to FTP and HTTP in documentationPaul Eggert2017-09-131-1/+1
| | | | | | | | | | | | | Most of this change is to boilerplate commentary such as license URLs. This change was prompted by ftp://ftp.gnu.org's going-away party, planned for November. Change these FTP URLs to https://ftp.gnu.org instead. Make similar changes for URLs to other organizations moving away from FTP. Also, change HTTP to HTTPS for URLs to gnu.org and fsf.org when this works, as this will further help defend against man-in-the-middle attacks (for this part I omitted the MS-DOS and MS-Windows sources and the test tarballs to keep the workload down). HTTPS is not fully working to lists.gnu.org so I left those URLs alone for now.
* Update copyright year to 2017Paul Eggert2016-12-311-1/+1
| | | | Run admin/update-copyright.
* Update copyright year to 2016Paul Eggert2016-01-011-1/+1
| | | | Run admin/update-copyright.
* ‘text-quoting-style’ fixes for adminPaul Eggert2015-08-271-2/+2
| | | | | | | * admin/admin.el (cusver-scan, cusver-check): * admin/authors.el (authors-canonical-file-name): * admin/bzrmerge.el (bzrmerge-missing): Respect ‘text-quoting-style’ in diagnostics.
* Update copyright year to 2015Paul Eggert2015-01-011-1/+1
| | | | Run admin/update-copyright.
* Update copyright year to 2014 by running admin/update-copyright.Paul Eggert2014-01-011-1/+1
|
* Merge from emacs-24Stefan Monnier2013-03-161-4/+4
|\
* | * bzrmerge.el (bzrmerge-apply): Omit Latin-1 char from diagnostic.Paul Eggert2013-03-021-1/+1
|/ | | | If there were a real need, it should be UTF-8 anyway.
* Update copyright notices for 2013.Paul Eggert2013-01-011-1/+1
|
* * admin/bzrmerge.el (bzrmerge-merges): Allow unversioned files in the tree.Glenn Morris2012-08-281-3/+10
|
* Merge from emacs-24; up to 2012-05-02T11:38:01Z!lekktu@gmail.comChong Yidong2012-08-111-1/+2
|\
| * * admin/bzrmerge.el (bzrmerge-resolve): Disable local eval:.Glenn Morris2012-08-091-1/+2
| |
* | Merge from emacs-24Stefan Monnier2012-07-171-4/+4
|\ \ | |/
* | Reduce use of (require 'cl).Stefan Monnier2012-07-101-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * admin/bzrmerge.el: Use cl-lib. * leim/quail/hangul.el: Don't require CL. * leim/quail/ipa.el: Use cl-lib. * vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el: * vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el: * register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el: * msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el: * international/quail.el, info-xref.el, imenu.el, image-mode.el: * font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el: * battery.el, avoid.el, abbrev.el: Use cl-lib. * vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el: * vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el: * jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el: * emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el: * calculator.el, autorevert.el, apropos.el: Don't require CL. * emacs-bytecomp.el (byte-recompile-directory, display-call-tree) (byte-compile-unfold-bcf, byte-compile-check-variable): * emacs-byte-opt.el (byte-compile-trueconstp) (byte-compile-nilconstp): * emacs-autoload.el (make-autoload): Use pcase. * face-remap.el (text-scale-adjust): Simplify pcase patterns.
* | * admin/bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit".Glenn Morris2012-05-021-1/+2
| |
* | * admin/bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk".Glenn Morris2012-04-101-3/+3
|/ | | | Add header keyword.
* Small bzrmerge.el change.Glenn Morris2012-01-181-3/+17
| | | | | * admin/bzrmerge.el (bzrmerge-missing): Allow a definitive "no" answer to the "skip?" question, since there can be multiple such for any revision.
* Add 2012 to FSF copyright years for Emacs filesGlenn Morris2012-01-051-1/+1
|
* * admin/bzrmerge.el (bzrmerge-resolve): Suppress prompts about file-locals.Glenn Morris2011-05-211-1/+2
|
* Add comments about fixing dates in merged ChangeLogs.Glenn Morris2011-02-221-0/+3
|
* * admin/bzrmerge.el (bzrmerge-resolve): Fix bzr revert call.Glenn Morris2011-02-121-1/+3
|
* bzrmerge.el trivia.Glenn Morris2011-02-051-1/+9
| | | | | | * admin/bzrmerge.el (bzrmerge-warning-buffer): New constant. (bzrmerge-apply): Use it. (bzrmerge): Kill any old warning buffer first.
* bzrmerge.el trivia.Glenn Morris2011-02-021-9/+16
| | | | | | | | * admin/bzrmerge.el (bzrmerge-buffer): New constant. (bzrmerge-merges, bzrmerge-missing, bzrmerge-apply): Use it. (bzrmerge-missing): If nothing to do, return nil not (nil). (bzrmerge-apply): Remove odd character from message. (bzrmerge): Give status messages.
* Make it easier to control which revisions bzrmerge might skip.Glenn Morris2011-01-241-2/+7
| | | | | * admin/bzrmerge.el (bzrmerge-skip-regexp): New variable. (bzrmerge-missing): Use it.
* Convert consecutive FSF copyright years to ranges.Glenn Morris2011-01-241-1/+1
|
* * admin/bzrmerge.el: Fix paren typo in previous.Glenn Morris2011-01-171-1/+1
|
* * admin/bzrmerge.el (bzrmerge-apply): Warn the user when the tree might be inStefan Monnier2011-01-171-0/+11
| | | | an inconsistent state.
* bzrmerge.el trivia.Glenn Morris2011-01-151-2/+3
| | | | | * admin/bzrmerge.el (bzrmerge-missing): Add another skip indicator. (bzrmerge-resolve): Also ignore cl-loaddefs.el.
* * admin/bzrmerge.el: Require cl when compiling.Glenn Morris2011-01-131-1/+4
| | | | (bzrmerge-merges): Doc fix.
* * admin/bzrmerge.el: Standardize copyright and license headers.Glenn Morris2011-01-111-5/+5
|
* * admin/bzrmerge.el: New file to help merge branches while skippingStefan Monnier2010-12-261-0/+296
some revisions (e.g. from emacs-23 to trunk).
View Lorry Controller Status