/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/xml_serializer.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-04-14 07:26:43 UTC
  • mfrom: (5151.1.1 update)
  • Revision ID: pqm@pqm.ubuntu.com-20100414072643-kxva2lpej0ck8m4d
(robertc) Do not warn when updating if a pending merge was merged into
 trunk. (Robert Collins, bug 562079)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/xml_serializer.py
23
23
# ElementTree bits
24
24
 
25
25
from bzrlib.serializer import Serializer
26
 
from bzrlib.trace import mutter
 
26
from bzrlib.trace import mutter, warning
27
27
 
28
28
try:
29
29
    try: