/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/shelf.py

  • Committer: Robert Collins
  • Date: 2010-04-14 04:48:00 UTC
  • mto: This revision was merged to the branch mainline in revision 5153.
  • Revision ID: robertc@robertcollins.net-20100414044800-wda5phry84h497pn
``bzr update`` when a pending merge in the working tree has been merged
into the master branch will no longer claim that old commits have become
pending merges. (Robert Collins, #562079)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf.py
23
23
    errors,
24
24
    merge,
25
25
    merge3,
 
26
    osutils,
26
27
    pack,
27
28
    transform,
 
29
    ui,
 
30
    workingtree,
28
31
)
29
32
 
30
33