/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: Vincent Ladeuil
  • Date: 2009-08-26 09:06:02 UTC
  • mto: (4651.1.2 integration)
  • mto: This revision was merged to the branch mainline in revision 4653.
  • Revision ID: v.ladeuil+lp@free.fr-20090826090602-uu9vapyw6yhbz6ak
Catch up fix for #347649.

* bzrlib/tests/blackbox/test_filesystem_cicp.py:
(TestMisc.test_status): status display parents if modified

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