- 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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
capture_tree.py |
1393.1.39 | 19 years ago | Martin Pool | - tweak capture_tree formatting | 1 KB |
|
|
|
convertfile.py |
942 | 19 years ago | Martin Pool | - update convertinv to work with current weave cod | 2.1 KB |
|
|
|
convertinv.py |
893 | 19 years ago | Martin Pool | - Refactor weave calculation of inclusions | 2 KB |
|
|
|
history2revfiles.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 2.8 KB |
|
|
|
http_client.py |
1092.1.39 | 19 years ago | Robert Collins | merge from mpool | 15 KB |
|
|
|
weavebench.py |
1092.1.37 | 19 years ago | Robert Collins | unbreak weavebench | 2.6 KB |
|
|
|
weavemerge.sh |
921 | 19 years ago | Martin Pool | - shell script to set up a weave merge test case | 584 bytes |
|
|