- 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)
* '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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
cache-remote-revisions.diff |
688 | 19 years ago | Martin Pool | - add deferred patch from abentley to fetch rem | 4.8 KB |
|
|
|
cache_weave_inclusions.diff |
1327 | 19 years ago | Martin Pool | - draft patch to cache weave inclusions (doesn't | 2.5 KB |
|
|
|
find-touching-from-seq.diff |
631 | 19 years ago | Martin Pool | - add deferred patch for finding touching patches | 2.7 KB |
|
|
|
meta-data-in-inventory.patch |
677 | 19 years ago | Martin Pool | - draft 'meta' command by john | 10.4 KB |
|
|
|
ndiff.patch |
817 | 19 years ago | Martin Pool | - Deferred patch that uses Python ndiff format. | 4.7 KB |
|
|