From: Eli Zaretskii <eliz@gnu.org>
To: Tassilo Horn <tsdh@gnu.org>
Cc: xfq.free@gmail.com, emacs-devel@gnu.org
Subject: Re: Bzr taskbranches and ChangeLog
Date: Sat, 21 Dec 2013 10:35:51 +0200 [thread overview]
Message-ID: <83lhzea9eg.fsf@gnu.org> (raw)
In-Reply-To: <87sitmtzg6.fsf@thinkpad.tsdh.org>
> From: Tassilo Horn <tsdh@gnu.org>
> Date: Sat, 21 Dec 2013 08:50:33 +0100
> Cc: emacs-devel@gnu.org
>
> Hm, do you use that plugin?
I do, all the time.
> It doesn't seem to work as advertised here. I have put
>
> [/home/horn/Repos/el/emacs/]
> changelog_merge_files = ChangeLog
>
> in my ~/.bazaar/locations.conf and updated my trunk and merged into my
> taskbranch, but now the ChangeLog entries I have received from the trunk
> are on top of my own entry whereas it should be the other way round.
That's what this plugin is supposed to do, since your entries
"arrived" in that branch before the merged ones. There's no better
strategy in the general case, when there are changes in ChangeLog not
only at the top. And when you merge to your bound branch, the result
will be exactly right: your entries will be at the top.
As I mentioned in my other mail, you need to move your entries to the
top of the file before committing upstreams.
next prev parent reply other threads:[~2013-12-21 8:35 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 [this message]
2013-12-23 8:15 ` Tassilo Horn
2013-12-21 8:03 ` Tassilo Horn
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=83lhzea9eg.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=tsdh@gnu.org \
--cc=xfq.free@gmail.com \
/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).