Additional changelog entries are modified when merging another branch
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Ubuntu Distributed Development |
Fix Released
|
High
|
Andrew Bennetts | ||
bzr-builddeb |
Fix Released
|
Medium
|
Andrew Bennetts |
Bug Description
While trying to merge multiple branches into the mysql-dfsg-5.1 lucid branch I've found that starting from the second branch to merge debian/changelog had more modification that expected.
To reproduce:
Get the mysql-dfsg-5.1 lucid packaging branch:
bzr init-repo mysql-pkg
cd mysql-pkg/
bzr co lp:ubuntu/lucid/mysql-dfsg-5.1 l
Get the two branches to merge into the packaging branch:
bzr co lp:~mathiaz/ubuntu/lucid/mysql-dfsg-5.1/zap-bug-394515
bzr co lp:~mathiaz/ubuntu/lucid/mysql-dfsg-5.1/zap-bug-444349
Create a local branch to work on the merge:
bzr branch l l-bug-zap
cd l-bug-zap/
Merge the first branch:
bzr merge ../zap-bug-394515
debcommit
Merge the second branch:
bzr merge ../zap-bug-444349/
A conflict is created (normal):
N debian/
M debian/changelog
Text conflict in debian/changelog
1 conflicts encountered.
Looking at the diff of debian/changelog:
bzr diff debian/changelog
=== modified file 'debian/changelog'
--- debian/changelog 2010-03-31 23:37:09 +0000
+++ debian/changelog 2010-04-01 00:35:01 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
mysql-dfsg-5.1 (5.1.41-3ubuntu10) UNRELEASED; urgency=low
* debian/
@@ -5,6 +6,16 @@
-- Mathias Gug <email address hidden> Wed, 31 Mar 2010 19:35:34 -0400
+=======
+mysql-dfsg-5.1 (5.1.41-3ubuntu10) UNRELEASED; urgency=low
+
+ * debian/
+ since 5.1 fails to start if skip-bdb is in the configuration file.
+ (LP: #444349).
+
+ -- Mathias Gug <email address hidden> Wed, 31 Mar 2010 19:22:34 -0400
+
+>>>>>>> MERGE-SOURCE
mysql-dfsg-5.1 (5.1.41-3ubuntu9) lucid; urgency=low
* debian/{control, rules, mysql-testsuite.*}: Fix up testsuite package.
@@ -3234,9 +3245,15 @@
mysql-dfsg (4.0.20-8) unstable; urgency=low
- * Upload stalled. Not released.
+ * The mysqlcheck that is started from the initscript will now be
+ backgrounded because it might else prevent the boot process to continue.
+ It also now notifies root by mail and syslog if a table is corrupt.
+ * The "debian-sys-maint" MySQL user now has almost full rights so that other
+ packages might use this account to create databases and user (thanks to
+ Andreas Barth). Closes: #262541
+ * Added paranoid rules for logcheck.
- -- Christian Hammers <email address hidden> Sun, 1 Aug 2004 20:27:55 +0200
+ -- Christian Hammers <email address hidden> Sun, 1 Aug 2004 21:00:55 +0200
mysql-dfsg (4.0.20-7) unstable; urgency=medium
@@ -4758,6 +4775,14 @@
-- Scott Hanson <email address hidden> Wed, 28 Jan 1998 18:59:09 +0100
+mysql (3.21.21.beta-1) unstable; urgency=low
+
+ * Use debhelper where possible in rules
+ * Split binary packages into mysql-base, mysql-client, mysql-doc
+ * New upstream release
+
+ -- Scott Hanson <email address hidden> Thu, 15 Jan 1998 08:12:17 +0100
+
mysql (3.21.21a.beta-2) unstable; urgency=low
* Compile with libpthreads from libc6-dev_2.0.6-3 rather than statically
@@ -4773,14 +4798,6 @@
-- Scott Hanson <email address hidden> Mon, 19 Jan 1998 07:52:48 +0100
-mysql (3.21.21.beta-1) unstable; urgency=low
-
- * Use debhelper where possible in rules
- * Split binary packages into mysql-base, mysql-client, mysql-doc
- * New upstream release
-
- -- Scott Hanson <email address hidden> Thu, 15 Jan 1998 08:12:17 +0100
-
mysql (3.21.19.beta-1) unstable; urgency=low
* Offer to set root password in mysql_install_db
And compare that with the diff of the debian/changelog of branch to merge:
cd ../zap-bug-444349
bzr diff --old ../l/ debian/changelog
=== modified file 'debian/changelog'
--- debian/changelog 2010-03-25 09:08:05 +0000
+++ debian/changelog 2010-04-01 00:32:24 +0000
@@ -1,3 +1,11 @@
+mysql-dfsg-5.1 (5.1.41-3ubuntu10) UNRELEASED; urgency=low
+
+ * debian/
+ since 5.1 fails to start if skip-bdb is in the configuration file.
+ (LP: #444349).
+
+ -- Mathias Gug <email address hidden> Wed, 31 Mar 2010 19:22:34 -0400
+
mysql-dfsg-5.1 (5.1.41-3ubuntu9) lucid; urgency=low
* debian/{control, rules, mysql-testsuite.*}: Fix up testsuite package.
There are additional modification in the debian/changelog (eg 3.21.21.beta-1).
Related branches
- Jelmer Vernooij: Approve (code)
-
Diff: 438 lines (+167/-161)4 files modifiedREADME (+5/-0)
debian/changelog (+10/-1)
merge_changelog.py (+60/-116)
tests/test_merge_changelog.py (+92/-44)
tags: | added: bzr |
Changed in bzr-builddeb: | |
status: | New → Triaged |
importance: | Undecided → Medium |
Changed in bzr-builddeb: | |
milestone: | none → 2.7.7 |
assignee: | nobody → Andrew Bennetts (spiv) |
status: | Triaged → Fix Released |
Changed in udd: | |
assignee: | nobody → Andrew Bennetts (spiv) |
status: | Confirmed → Fix Released |
(l)mathiaz@ mathiaz- srv:~/tmp/ mysql-pkg$ bzr --version 6.24-25- server- x86_64- with-Ubuntu- 10.04-lucid python2. 6/dist- packages/ bzrlib .bazaar .bzr.log
Bazaar (bzr) 2.1.1
Python interpreter: /usr/bin/python 2.6.5
Python standard library: /usr/lib/python2.6
Platform: Linux-2.
bzrlib: /usr/lib/
Bazaar configuration: /home/mathiaz/
Bazaar log file: /home/mathiaz/
Copyright 2005-2010 Canonical Ltd. bazaar- vcs.org/
http://
bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and
you may use, modify and redistribute it under the terms of the GNU
General Public License version 2 or later.
Bazaar is part of the GNU Project to produce a free operating system.
(l)mathiaz@ mathiaz- srv:~/tmp/ mysql-pkg$ bzr plugins
builddeb 2.2.0
bzr-builddeb - manage packages in a Bazaar branch.
builder
The bzr-builder plugin allows you to construct a branch from a 'recipe'.
bzrtools 2.1.0
Various useful commands for working with bzr.
fastimport
Fast, stream-based importing of data into Bazaar.
git 0.4.3
A GIT branch and repository format implementation for bzr.
launchpad 2.1.1
Launchpad.net integration plugin for Bazaar.
loom 1.4.0dev
Loom is a bzr plugin which adds new commands to manage a loom of patches.
netrc_credentia l_store 2.1.1 conf.
Use ~/.netrc as a credential store for authentication.
news_merge 2.1.1
Merge hook for bzr's NEWS file.
svn 1.0.2
Support for Subversion branches