aboutsummaryrefslogtreecommitdiffstats
path: root/admin/notes/repo (follow)
Commit message (Collapse)AuthorAgeFilesLines
* maint: shorten https://lists.gnu.org/archive/html/... linksPaul Eggert2017-11-251-2/+2
|
* Prefer HTTPS to HTTP for gnu.orgPaul Eggert2017-10-011-2/+2
| | | | | | | | | This fixes some URLs I omitted from my previous pass, notably those in lists.gnu.org. Although lists.gnu.org does not yet support TLS 1.1, TLS 1.0 is better than nothing. * lisp/erc/erc.el (erc-official-location): * lisp/mail/emacsbug.el (report-emacs-bug): Use https:, not http:.
* ; Move stray item from admin/notes/repo to CONTRIBUTENoam Postavsky2017-04-191-7/+0
| | | | | * admin/notes/repo: Remove stray item. * CONTRIBUTE: Move it here, fix incorrect references to "branch".
* * admin/notes/repo: Fix a few obsolete references to BazaarJuanma Barranquero2015-11-061-2/+2
|
* Prefer straight quoting in some text filesPaul Eggert2015-09-111-4/+4
| | | | | | | | | Mostly this just changes ` to ' in static text. Some exceptions: * INSTALL.REPO: Use curved quotes, as the diagnostic in question typically does that now. * admin/quick-install-emacs (TRY, top level): Use straight quoting in diagnostics. * src/README: Fix working-directory confusion.
* Generate a ChangeLog file from commit logsPaul Eggert2015-04-071-22/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * .gitignore: Add 'ChangeLog'. * build-aux/gitlog-to-changelog: New file, from Gnulib. * build-aux/gitlog-to-emacslog: New file. * CONTRIBUTE: Document the revised workflow. * Makefile.in (clean): Remove *.tmp and etc/*.tmp* instead of just special cases. (CHANGELOG_HISTORY_INDEX_MAX, CHANGELOG_N, gen_origin): New vars. (ChangeLog, unchanged-history-files, change-history) (change-history-commit): New rules. * admin/admin.el (make-manuals-dist--1): Don't worry about doc/ChangeLog. * admin/authors.el: Add a FIXME. * admin/make-tarball.txt: * lisp/calendar/icalendar.el: * lisp/gnus/deuglify.el: * lisp/obsolete/gulp.el: * lwlib/README: Adjust to renamed ChangeLog history files. * admin/merge-gnulib (GNULIB_MODULES): Add gitlog-to-changelog. * admin/notes/repo: Call it 'master' a la Git, not 'trunk' a la Bzr. Remove obsolete discussion of merging ChangeLog files. New section "Maintaining ChangeLog history". * build-aux/git-hooks/pre-commit: Reject attempts to commit files named 'ChangeLog'. * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. * make-dist: Make and distribute top-level ChangeLog if there's a .git directory. Distribute the new ChangeLog history files instead of scattered ChangeLog files. Distribute the new files gitlog-to-changelog and gitlog-to-emacslog. Fixes: bug#19113
* Merge from origin/emacs-24Paul Eggert2015-03-031-0/+21
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f160106 Avoid assertion violations in Rmail due to newline cache 1b0ebbd browse-url-firefox: update for firefox 36's removal of -remote 1817892 Avoid erratic behavior of menu-bar tooltips on w32 (Bug#19925) 0260932 Bump python.el version b0adfc7 Spelling fixes 35f047c * src/fileio.c (Fmake_temp_name): Doc tweaks. 6f2971a * lisp/comint.el (comint-line-beginning-position): Revert searching 65d8ac7 Mention in admin/notes/repo how to mark commits not to be merged. 86fe750 # Remove NEWS temporary markup 4fa778b erc.el: Add old version header for package.el compatibilty 9366f05 Tramp: Disable paging with PAGER=cat Conflicts: admin/notes/repo etc/NEWS lisp/ChangeLog lisp/erc/ChangeLog src/ChangeLog
| * Mention in admin/notes/repo how to mark commits that are not to be merged.Eli Zaretskii2015-02-191-1/+3
| |
* | Improve CONTRIBUTE and related files.Stephen Leake2014-12-061-92/+0
| | | | | | | | | | | | | | | | | | | | | | * CONTRIBUTE: improve; add explicit web references, move some info from admin/notes/* here. * INSTALL.REPO: You can't "just run make" after a clean checkout. * admin/notes/commits: deleted; merged into ./CONTRIBUTE * admin/notes/repo: move commit, branch info into ./CONTRIBUTE
* | Merge branch 'emacs-24'.Paul Eggert2014-11-281-6/+34
|\ \ | |/
| * Lessen focus on ChangeLog files, as opposed to change log entries.Paul Eggert2014-11-191-6/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for generating the former automatically from the latter. * admin/notes/bugtracker, admin/notes/copyright, admin/notes/newfile: ChangeLog -> change log * admin/notes/changelogs: Remove, merging old contents to ... * admin/notes/repo: ... here. * doc/emacs/maintaining.texi (Change Log): Mention that ChangeLog files may be copied to or from a version control system. * doc/emacs/trouble.texi (Sending Patches): Point to the commit messages. * doc/lispref/intro.texi (Acknowledgments): ChangeLog file -> change log entries. * doc/lispref/tips.texi (Library Headers): Emacs uses a version control system. * etc/CONTRIBUTE: Give advice about git commit messages and how to generate proposed patches containing them.
| * Git transition patchEric S. Raymond2014-11-111-309/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | All bzr revision IDS, and all CVS revision IDs for which a commit could be identified, were changed to time-date!committer version stamps. All .cvsignore files in the history became .gitignore files. Fixes-bug annotations from bzr were copied into the corresponding commit comments. (The first .cvsignore commit was 1999-09-30T14:07:54Z!fx@gnu.org>. The last CVS commit was <2009-12-27T08:11:12Z!cyd@stupidchicken.com>) Committer/author email addresses are generally correct for the transition day, not necessarily when the commit was originally made.
* | Git transition patchEric S. Raymond2014-11-111-340/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | All bzr revision IDS, and all CVS revision IDs for which a commit could be identified, were changed to time-date!committer version stamps. All .cvsignore files in the history became .gitignore files. Fixes-bug annotations from bzr were copied into the corresponding commit comments. (The first .cvsignore commit was 1999-09-30T14:07:54Z!fx@gnu.org>. The last CVS commit was <2009-12-27T08:11:12Z!cyd@stupidchicken.com>) Committer/author email addresses are generally correct for the transition day, not necessarily when the commit was originally made.
* | Spelling fixes; tweak explanation of commit messages.Paul Eggert2014-11-041-8/+11
| | | | | | | | | | | | | | * admin/notes/repo: Avoid "DVCS" acronym without first explaining it. Mention using the first line of a ChangeLog as the topic line, and that commit messages should use UTF-8. * lisp/mouse.el (mouse-drag-line): Fix misspelling of "right-fringe".
* | Merge from emacs-24; up to 117656Glenn Morris2014-11-011-11/+8
|\ \ | |/
| * Minor fixes in the changes in preparation for git migration.Eli Zaretskii2014-10-311-11/+8
| | | | | | | | | | | | | | | | | | src/Makefile.in (repo-update): Fix a typo and slightly reword commentary. admin/notes/repo (Notes): Reword the stylistic guidance for commit log messages so that they are in line with Emacs development practices and style guidance.
| * Backport from trunk more changes in preparation for git migration.Eric S. Raymond2014-10-311-26/+46
| | | | | | | | | | | | | | | | | | | | admin/notes/bzr: Renamed to notes/repo, reorganixed to separate VCS-dependent from VCS-independent stuff. Added guidance about commit-comment format under DVCSes. admin/notes/BRANCH: Merged into notes/repo. lisp/version.el: Fix some fallback values to conform to the actual release number.
| * Backport changes in preparation for git migration from trunk.Eric S. Raymond2014-10-311-0/+426
| | | | | | | | | | | | admin: Changes in several documents. autogen.sh: Neutralize language specific to a repository type. doc/misc/efaq-w32.texi: Neutralized language specific to a repository type. doc/misc/gnus-coding.txt: Neutralized language specific to a repository type. lisp/Makefile.in: Change some production names so they're neutral about the repository type.
* Guidance on commit-comment formats.Eric S. Raymond2014-10-261-0/+18
|
* More preparation for git tramsition. Reorganize to sparate our dependencies.Eric S. Raymond2014-10-261-26/+28
|
* Merge BRANCH into repo, because it belongs with the developer advice. Also...Eric S. Raymond2014-10-261-0/+36
| | | | ...this helps prepare for the repository move.
* Rename the 'bzr' notes file to 'repo'. For two reasons:Eric S. Raymond2014-10-261-0/+410
1. A significant portion of the advice is independent of any specific version-control sytem. 2. Doing the rename now means it is easier to compose a multi-file patch that can be applied to fix the tree on the day of the git move.
generated by cgit v1.2.1 (git 2.18.0) at 2026-03-07 23:15:47 +0000