unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Tassilo Horn <tsdh@gnu.org>
To: emacs-devel@gnu.org
Subject: Re: Bzr taskbranches and ChangeLog
Date: Sat, 21 Dec 2013 09:03:54 +0100	[thread overview]
Message-ID: <87lhzetytx.fsf@thinkpad.tsdh.org> (raw)
In-Reply-To: <8761qjfdqt.fsf@thinkpad.tsdh.org> (Tassilo Horn's message of "Fri, 20 Dec 2013 21:50:50 +0100")

Hi again,

now I assumed that the changelog_merge plugin would DTRT (which it
didn't) I committed my changes including those in the ChangeLog.  Then,
as documented on emacswiki, I did

  $ cd ../trunk
  $ bzr update
  $ cd ../bug-16090
  $ bzr merge
  $ bzr status
  $ bzr commit -m "Merge from trunk."

Now the result is that "bzr missing" tells me that I have 2 extra
revisions and no missing ones.  However, "bzr log" doesn't show me the
commits I've just merged, but the changes are here.  The commits seem to
be amalgamated in the merge commit that's on top of the log right now.
Is that how it is supposed to be?

Bye,
Tassilo



  parent reply	other threads:[~2013-12-21  8:03 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-20 20:50 Bzr taskbranches and ChangeLog Tassilo Horn
2013-12-21  1:16 ` Xue Fuqiao
2013-12-21  7:34   ` Tassilo Horn
2013-12-21  7:50     ` Tassilo Horn
2013-12-21  8:35       ` Eli Zaretskii
2013-12-23  8:15         ` Tassilo Horn
2013-12-21  8:03 ` Tassilo Horn [this message]
2013-12-21  8:43   ` Eli Zaretskii
2013-12-21  8:03 ` Eli Zaretskii
2013-12-21  8:44   ` Tassilo Horn
2013-12-21  8:49   ` Jarek Czekalski
2013-12-21  9:25     ` Eli Zaretskii
2013-12-21 13:32       ` Tassilo Horn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87lhzetytx.fsf@thinkpad.tsdh.org \
    --to=tsdh@gnu.org \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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).