1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-30 00:51:50 -08:00
Commit graph

31 commits

Author SHA1 Message Date
Paul Eggert
b20a9f96cb * notes/bzr: Update instructions for merging from gnulib.
Remove obsolete note about tramp.el and tramp-sh.el.
Change "emacs-23" to "emacs-24".
2014-04-17 14:20:51 -07:00
Thien-Thi Nguyen
2d7df629f7 Add some notes on git-bzr; nfc.
* admin/notes/bzr (Using git-bzr): New section.
2014-01-10 11:43:18 +01:00
Glenn Morris
f21407b2d5 * admin/notes/bzr: Mention origin of commit email From header. 2013-08-28 21:18:51 -04:00
Glenn Morris
efb860883d * admin/notes/bzr: Finally got the right locations.conf syntax 2013-06-06 20:41:10 -07:00
Glenn Morris
5f8015a6fe * admin/notes/bzr (Commit emails): Tweak previous. 2013-06-06 20:19:29 -07:00
Glenn Morris
29de612f84 * admin/notes/bzr (Commit emails): Previous did not work, try again. 2013-06-06 19:58:52 -07:00
Glenn Morris
e18039127e * admin/notes/bzr (Commit emails): More details. 2013-06-06 19:55:58 -07:00
Glenn Morris
63c2a956c9 * admin/notes/bzr (Commit emails): New section. 2013-06-06 19:40:15 -07:00
Glenn Morris
668187120a Add a very basic bisecting guide 2013-02-16 17:40:14 -08:00
Glenn Morris
4d4056371f How to uncommit 2012-12-29 10:15:47 -08:00
Paul Eggert
f6b1b0a848 Spelling fixes. 2011-11-12 23:48:23 -08:00
Glenn Morris
e350c3a032 bzr 2.4.0, including changelog_merge plugin, was released. 2011-09-01 00:24:27 -07:00
Glenn Morris
57f4e35d09 * admin/notes/bzr: Your very own Loggerhead server. 2011-05-28 10:46:02 -07:00
Glenn Morris
dc5e0b5aac * admin/notes/bzr: Update changelog_merge branch details. 2011-05-14 12:09:37 -07:00
Glenn Morris
0c6b7b19e5 * admin/notes/bzr: Small updates. 2011-04-25 21:50:33 -07:00
Glenn Morris
8ae17ff2bf * admin/notes/bzr: Update bzr changelog_merge plugin details. 2011-03-22 19:57:57 -07:00
Glenn Morris
0560d0ea3d * admin/notes/bzr: Tiny addition. 2011-02-28 19:41:05 -08:00
Glenn Morris
3cbbfdc34f * admin/notes/bzr: Small updates. 2011-02-23 19:56:36 -08:00
Glenn Morris
ed3d163155 * admin/notes/bzr: More details about merging ChangeLogs. 2011-02-22 20:24:13 -08:00
Glenn Morris
59af988b40 Add comments about fixing dates in merged ChangeLogs. 2011-02-22 19:50:04 -08:00
Glenn Morris
a241b7c067 * admin/notes/bzr: Add section on undoing a bzr remove. 2011-02-13 18:52:02 -08:00
Glenn Morris
d0ba09dcd8 * admin/notes/bzr: Mention the helpful changelog_merge plugin. 2011-02-12 15:43:42 -08:00
Glenn Morris
4474c927a7 * admin/notes/bzrmerge: Comment on skipped revisions. 2011-01-22 11:44:38 -08:00
Glenn Morris
b69258a1a8 * admin/notes/bzr: Fix typos in previous. 2011-01-17 18:57:04 -08:00
Glenn Morris
565cb73650 * admin/notes/bzr: More bzrmerge notes. 2011-01-17 18:55:26 -08:00
Glenn Morris
b91f171d26 * admin/notes/bzr: Add some more bzrmerge details. 2011-01-17 18:22:36 -08:00
Paul Eggert
9092d18633 * notes/bzr (Installing changes from gnulib): New section.
Need for this suggested by Stefan Monnier.
2011-01-17 14:11:13 -08:00
Glenn Morris
4ebf3ee11c * admin/notes/bzr: More on previous. 2011-01-15 13:51:36 -08:00
Glenn Morris
9aafb22b66 * admin/notes/bzr: Add an idiot's guide to merging between branches. 2011-01-15 13:47:46 -08:00
Eli Zaretskii
5739cdd25a Advise against unnecessary merges from trunk to feature branches. 2010-05-18 10:38:35 +03:00
Glenn Morris
51603dabe0 * admin/notes/bzr: New file.
More mailing-list wisdom.  Probably should be merged with commits.
2010-05-17 19:52:21 -07:00