unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
* Latest merge from the emacs-23 branch
@ 2010-12-17 16:03 Eli Zaretskii
  2010-12-17 18:19 ` Andreas Schwab
  2010-12-17 22:03 ` Stefan Monnier
  0 siblings, 2 replies; 9+ messages in thread
From: Eli Zaretskii @ 2010-12-17 16:03 UTC (permalink / raw)
  To: emacs-devel

The latest merge, which created revision 102642 on the trunk, shows a
lot of revisions from the branch as merged (to see them, try something
like "bzr log --line -c102642 -n0"), but at least some of them are not
actually included in the merge.  Here are a few examples:

 99634.2.670: Eli Zaretskii 2010-12-11 Fix bug #7398 with truncated glyphs...
 99634.2.664: Glenn Morris 2010-12-11 [Backport from trunk]: * make-dist: E...
 99634.2.658: Eli Zaretskii 2010-12-09 Fix bug #1077 with popping new frame...

These revisions indeed should not have been merged to the trunk, but
why do they show in Bazaar's merge log?  That will certainly
complicate future forensics, I think.



^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2010-12-19 15:10 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-17 16:03 Latest merge from the emacs-23 branch Eli Zaretskii
2010-12-17 18:19 ` Andreas Schwab
2010-12-17 19:22   ` Eli Zaretskii
2010-12-17 22:03 ` Stefan Monnier
2010-12-17 23:06   ` Eli Zaretskii
2010-12-18 15:58     ` Stefan Monnier
2010-12-18 17:37       ` Eli Zaretskii
2010-12-19 13:47         ` Stefan Monnier
2010-12-19 15:10           ` Eli Zaretskii

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).