Bazaar

news_merge confused by added sections

Bug #517490 reported by Vincent Ladeuil
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Bazaar
Confirmed
Low
Unassigned

Bug Description

I just encountered the following while merging 4597.3.74 revid:<email address hidden> into 5008 revid:<email address hidden> on bzr.dev:

bzr 2.2.0b1 (not released yet)
##############################

:Codename: ???
:2.2.0b1: ???

Compatibility Breaks
********************

* ``Repository.get_inventory_sha1()`` has been removed. (Jelmer Vernooij)

New Features
************

<<<<<<< TREE
* If the Apport crash-reporting tool is available, bzr crashes are now
  stored into the ``/var/crash`` apport spool directory, and the user is
  invited to report them to the developers from there, either
  automatically or by running ``apport-bug``. No information is sent
  without specific permission from the user. (Martin Pool, #515052)

Bug Fixes
*********

* Avoid infinite recursion when probing for apport.
  (Vincent Ladeuil, #516934)

Testing
*******

* Stop sending apport crash files to ``.cache`` in the directory from
  which ``bzr selftest`` was run. (Martin Pool, #422350)
=======
* Tree-shape conflicts can be resolved by providing ``--take-this`` and
  ``--take-other`` to the ``bzr resolve`` command. Just marking the conflict
  as resolved is still accessible via the ``--done`` default action.
  (Vincent Ladeuil)
>>>>>>> MERGE-SOURCE

I strongly suspect that the added sections are making the plugin's life harder.

Related branches

lp:~spiv/bzr/better-news-merge
On hold for merging into lp:bzr
Robert Collins (community): Needs Fixing
Diff: 747 lines (+587/-64)
7 files modified
NEWS (+4/-0)
bzrlib/merge3.py (+18/-4)
bzrlib/plugins/news_merge/__init__.py (+22/-2)
bzrlib/plugins/news_merge/news_merge.py (+230/-57)
bzrlib/plugins/news_merge/parser.py (+196/-1)
bzrlib/plugins/news_merge/tests/__init__.py (+1/-0)
bzrlib/plugins/news_merge/tests/test_parser.py (+116/-0)
Vincent Ladeuil (vila)
Changed in bzr:
status: New → Confirmed
importance: Undecided → Low
Revision history for this message
Vincent Ladeuil (vila) wrote :

Another occurrence while merging 5013.2.5 revid:<email address hidden> into 5029 revid:<email address hidden> on bzr.dev:

Bug Fixes
*********

* Added docstring for ``Tree.iter_changes``
  (John Arbash Meinel, #304182)

* Allow exporting a single file using ``bzr export``.
  (Michal Junák, #511987)

* Avoid infinite recursion when probing for apport.
  (Vincent Ladeuil, #516934)

<<<<<<< TREE
* Avoid ``malloc(0)`` in ``patiencediff``, which is non-portable.
  (Martin Pool, #331095)

* Network transfer amounts and rates are now displayed in SI units according
  to the Ubuntu Units Policy <https://wiki.ubuntu.com/UnitsPolicy>.
  (Gordon Tyler, #514399)

API Changes
***********

* New ``bzrlib.initialize`` is recommended for programs using bzrlib to
  run when starting up; it sets up several things that previously needed
  to be done separately.
  (Martin Pool, #507710)

* Remove unused ``CommandFailed`` exception.
  (Martin Pool)
=======
* ``bzr add`` will not add conflict related files unless explicitly required.
  (Vincent Ladeuil, #322767, #414589)
>>>>>>> MERGE-SOURCE

Testing
*******

Revision history for this message
Martin Pool (mbp) wrote : Re: [Bug 517490] [NEW] news_merge confused by added sections

I don't think news_merge is active on pqm. Or are you trying this locally?

Revision history for this message
John A Meinel (jameinel) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin Pool wrote:
> I don't think news_merge is active on pqm. Or are you trying this
> locally?
>

I've seen it happen locally. Though I'm not 100% convinced whether
news_merge is active or not. (And didn't take the time to re-run
'remerge' etc.)

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkt0QosACgkQJdeBCYSNAANR2gCgvxcd/9INVkpCsbjEIqLoBZyu
dA8AoNWpR7jNp8FWLFOII0INNB/BHRjx
=+CZl
-----END PGP SIGNATURE-----

Revision history for this message
Martin Pool (mbp) wrote :

On 12 February 2010 04:46, John A Meinel <email address hidden> wrote:
> I've seen it happen locally. Though I'm not 100% convinced whether
> news_merge is active or not. (And didn't take the time to re-run
> 'remerge' etc.)

Maybe we should show a message when we merge a file using a special treatment.

--
Martin <http://launchpad.net/~mbp/>

Revision history for this message
Vincent Ladeuil (vila) wrote :

>>>>> Martin Pool <email address hidden> writes:

    > I don't think news_merge is active on pqm.

Me neither.

    > Or are you trying this locally?

Yes.

And I'm sure the plugin is active as I fixed a bug about it (landed in
2.1).

Revision history for this message
Robert Collins (lifeless) wrote :

perhaps

M NEWS (used news_merge)

-Rob

Revision history for this message
Andrew Bennetts (spiv) wrote :

It happens that I had a merge that was hit by this, and I had a burst of inspiration about how to fix it without too much effort, so I've done that and proposed a merge for it.

On the tangent, I like Robert's idea for showing "(used news_merge)" in the 'bzr merge' output.

Changed in bzr:
assignee: nobody → Andrew Bennetts (spiv)
status: Confirmed → In Progress
Revision history for this message
Andrew Bennetts (spiv) wrote :

I'm not currently working on this, and don't plan to pick it up again soon as our new split-by-release NEWS files make the improvements in my work-in-progress patch less important.

I think the linked branch is still a good basis for future improvements though, if anyone is interested in working on this.

Changed in bzr:
assignee: Andrew Bennetts (spiv) → nobody
status: In Progress → Confirmed
Jelmer Vernooij (jelmer)
tags: added: check-for-breezy
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.