~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
..
bzrlib 1 19 years ago mbp at sourcefrog import from baz patch-364 Diff
contrib 331 19 years ago Martin Pool - sketchy experiments in bash and zsh completion Diff
doc 6 19 years ago mbp at sourcefrog import all docs from arch Diff
notes 10 19 years ago mbp at sourcefrog import more files from baz Diff
patches 520 19 years ago Martin Pool - add space for un-merged patches Diff
tools 854 19 years ago Martin Pool - rearrange and clear up merged weave Diff
.bzrignore 1185.12.3 19 years ago Aaron Bentley Ignored user-installed plugins 207 bytes Diff Download File
.rsyncexclude 1185.16.34 19 years ago Martin Pool - ignore .swp files from upload 176 bytes Diff Download File
build-api 496 19 years ago Martin Pool - patch from ddaa to create api/ directory befo 88 bytes Diff Download File
File bzr 1417.1.9 19 years ago Robert Collins merge from upstream 1.9 KB Diff Download File
bzr-man.py 1185.1.43 19 years ago Robert Collins patch from Rob Weir to correct bzr-man.py 7.5 KB Diff Download File
HACKING 1417.1.4 19 years ago Robert Collins merge from upstream 6.1 KB Diff Download File
Makefile 1427 19 years ago Robert Collins clean up test dirs on make clean 335 bytes Diff Download File
NEWS 1442.1.70 19 years ago Robert Collins Add assertFileEqual to TestCaseInTempDir. There i 22.6 KB Diff Download File
NEWS.developers 1185.16.35 19 years ago Martin Pool - stub for revision properties 910 bytes Diff Download File
README 966 19 years ago Martin Pool - now needs python 2.4 - update instructions for r 1.3 KB Diff Download File
File setup.py 1442.1.64 19 years ago Robert Collins Branch.open_containing now returns a tuple (Branch 2.1 KB Diff Download File
testbzr 736 19 years ago Martin Pool - move old blackbox code from testbzr into bzrlib. 845 bytes Diff Download File
TODO 974.1.92 19 years ago Aaron Bentley TODO re tests 17.3 KB Diff Download File
tutorial.txt 1185.1.13 19 years ago Robert Collins and the tutorial patch came back, the very next da 9.9 KB Diff Download File