~bzr-pqm/bzr/bzr.dev

  • Committer: Robert Collins
  • Date: 2005-10-18 12:53:07 UTC
  • mfrom: (1442.1.70)
  • Revision ID: robertc@robertcollins.net-20051018125307-730e47c1a034cb6f
Merge in various improvements to pull, testing and configuration.

* 'bzr pull' now accepts '--clobber' which will discard local changes
  and make this branch identical to the source branch. (Robert Collins)

* There is a new method for TestCaseInTempDir, assertFileEqual, which
  will check that a given content is equal to the content of the named
  file. (Robert Collins)

* 'pull' has been factored out of the command as WorkingTree.pull().
  A new option to WorkingTree.pull has been added, clobber, which will
  ignore diverged history and pull anyway.
  (Robert Collins)

* config.Config has a 'get_user_option' call that accepts an option name.
  This will be looked up in branches.conf and bazaar.conf as normal.
  It is intended that this be used by plugins to support options -
  options of built in programs should have specific methods on the config.
  (Robert Collins)
Filename Latest Rev Last Changed Committer Comment Size
..
bash 331 19 years ago Martin Pool - sketchy experiments in bash and zsh completion Diff
emacs 1110 19 years ago Martin Pool - merge aaron's merge improvements: * When merg Diff
zsh 331 19 years ago Martin Pool - sketchy experiments in bash and zsh completion Diff
add-bzr-to-baz 690 19 years ago Martin Pool add-bzr-to-baz allows multiple arguments 223 bytes Diff Download File
create_bzr_rollup.py 625 19 years ago Martin Pool - fix permissions on exported tar/zip files 5.5 KB Diff Download File
fortune 423 19 years ago Martin Pool - Add fortune-cookie external plugin demonstration 306 bytes Diff Download File
newinventory.py 1390 19 years ago Robert Collins pair programming worx... merge integration and wea 4.3 KB Diff Download File
pwclient.full 715 19 years ago Martin Pool - add jk's patchwork client 13 KB Diff Download File
pwk 856 19 years ago Martin Pool - fix pwk help 951 bytes Diff Download File
upload-bzr.dev 788 19 years ago Martin Pool - tweak rsync upload script 829 bytes Diff Download File