Glenn Morris
23c726f65a
* admin/bzrmerge.el (bzrmerge-resolve): Disable local eval:.
2012-08-09 23:57:34 -07:00
Glenn Morris
54de86ac62
Small bzrmerge.el change.
...
* admin/bzrmerge.el (bzrmerge-missing): Allow a definitive "no" answer
to the "skip?" question, since there can be multiple such for any revision.
2012-01-18 22:42:57 -08:00
Glenn Morris
acaf905b11
Add 2012 to FSF copyright years for Emacs files
2012-01-05 01:46:05 -08:00
Glenn Morris
2a35386df4
* admin/bzrmerge.el (bzrmerge-resolve): Suppress prompts about file-locals.
2011-05-21 14:19:30 -07:00
Glenn Morris
59af988b40
Add comments about fixing dates in merged ChangeLogs.
2011-02-22 19:50:04 -08:00
Glenn Morris
7b24e97ab5
* admin/bzrmerge.el (bzrmerge-resolve): Fix bzr revert call.
2011-02-12 15:37:43 -08:00
Glenn Morris
4d881c8341
bzrmerge.el trivia.
...
* admin/bzrmerge.el (bzrmerge-warning-buffer): New constant.
(bzrmerge-apply): Use it.
(bzrmerge): Kill any old warning buffer first.
2011-02-05 14:46:34 -08:00
Glenn Morris
f6041baa9d
bzrmerge.el trivia.
...
* 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.
2011-02-02 23:09:50 -08:00
Glenn Morris
d0cb866238
Make it easier to control which revisions bzrmerge might skip.
...
* admin/bzrmerge.el (bzrmerge-skip-regexp): New variable.
(bzrmerge-missing): Use it.
2011-01-24 21:10:02 -08:00
Glenn Morris
73b0cd5003
Convert consecutive FSF copyright years to ranges.
2011-01-24 20:08:28 -08:00
Glenn Morris
acce4a473a
* admin/bzrmerge.el: Fix paren typo in previous.
2011-01-17 18:35:23 -08:00
Stefan Monnier
41f44310b3
* admin/bzrmerge.el (bzrmerge-apply): Warn the user when the tree might be in
...
an inconsistent state.
2011-01-17 16:18:00 -05:00
Glenn Morris
6fffc9003c
bzrmerge.el trivia.
...
* admin/bzrmerge.el (bzrmerge-missing): Add another skip indicator.
(bzrmerge-resolve): Also ignore cl-loaddefs.el.
2011-01-15 12:42:23 -08:00
Glenn Morris
1851cac3e3
* admin/bzrmerge.el: Require cl when compiling.
...
(bzrmerge-merges): Doc fix.
2011-01-13 18:44:25 -08:00
Glenn Morris
529ee9edf2
* admin/bzrmerge.el: Standardize copyright and license headers.
2011-01-11 20:28:12 -08:00
Stefan Monnier
9ebea0e746
* admin/bzrmerge.el: New file to help merge branches while skipping
...
some revisions (e.g. from emacs-23 to trunk).
2010-12-26 20:27:08 -05:00
