← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: John Arbash Meinel
  • Date: 2005-07-11 21:19:12 UTC
  • mto: (1185.11.1)
  • mto: This revision was merged to the branch mainline in revision 1396.
  • Revision ID: john@arbash-meinel.com-20050711211912-df0f83fb6034440d
Removed Transport.open(), making get + put encode/decode to utf-8

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
560
560
                
561
561
            merge(('.', -1), ('.', old_revno), check_clean=False)
562
562
            if location != stored_loc:
563
 
                br_to.controlfile("x-pull", "wb").write(location + "\n")
 
563
                br_to.put_controlfile('x-pull', location+'\n')
564
564
        finally:
565
565
            rmtree(cache_root)
566
566
 
630
630
            merge((to_location, -1), (to_location, 0), this_dir=to_location,
631
631
                  check_clean=False, ignore_zero=True)
632
632
            from_location = br_from.base
633
 
            br_to.controlfile("x-pull", "wb").write(from_location + "\n")
 
633
            br_to.put_controlfile('x-pull', from_location+'\n')
634
634
        finally:
635
635
            rmtree(cache_root)
636
636