- Committer: Aaron Bentley
- Date: 2005-09-18 21:37:03 UTC
- mto: (1185.1.29)
- Revision ID: aaron.bentley@utoronto.ca-20050918213703-20437815d381a735
Set a pending_merge if the merge base is forced to revno 0
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
plugins
|
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg |
|
||
|
selftest
|
723 | 19 years ago | Martin Pool | - move whitebox/blackbox modules into bzrlib.selft |
|
||
|
util
|
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg |
|
||
__init__.py |
1176 | 19 years ago | Martin Pool | - advance version to 0.1pre | 1.9 KB |
|
|
|
add.py |
1185.3.3 | 19 years ago | Martin Pool | - patch from mpe to automatically add parent direc | 5.3 KB |
|
|
|
atomicfile.py |
565 | 19 years ago | Martin Pool | - more invariant checks in AtomicFile | 2.9 KB |
|
|
|
branch.py |
974.1.88 | 19 years ago | Aaron Bentley | Set a pending_merge if the merge base is forced to | 52.7 KB |
|
|
|
builtins.py |
974.1.79 | 19 years ago | Aaron Bentley | Fixed issues with pull not having a default locati | 40.6 KB |
|
|
|
changeset.py |
974.1.83 | 19 years ago | Aaron Bentley | Removed unused dir parameter from ExceptionConflic | 51.7 KB |
|
|
|
check.py |
974.1.52 | 19 years ago | aaron.bentley at utoronto | Merged mpool's latest changes (~0.0.7) | 9.9 KB |
|
|
|
commands.py |
974.1.82 | 19 years ago | Aaron Bentley | Handled NotBranchError like a CommandError in main | 21 KB |
|
|
|
commit.py |
1182 | 19 years ago | Martin Pool | - more disentangling of xml storage format from ob | 11.3 KB |
|
|
|
delta.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 7.5 KB |
|
|
|
diff.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 8.1 KB |
|
|
|
errors.py |
974.1.80 | 19 years ago | Aaron Bentley | Improved merge error handling and testing | 3.9 KB |
|
|
|
externalcommand.py |
1170 | 19 years ago | Martin Pool | - make external commands work again code is now | 1.8 KB |
|
|
|
fetch.py |
974.1.52 | 19 years ago | aaron.bentley at utoronto | Merged mpool's latest changes (~0.0.7) | 2.9 KB |
|
|
|
graph.py |
974.1.87 | 19 years ago | Aaron Bentley | Refactored and documented graph stuff | 3.9 KB |
|
|
|
hashcache.py |
954 | 19 years ago | Martin Pool | - separate out code that just scans the hash cache | 7.5 KB |
|
|
|
help.py |
1177 | 19 years ago | Martin Pool | - help on command says "usage: bzr help" | 4.5 KB |
|
|
|
info.py |
542 | 19 years ago | Martin Pool | - fix typo | 3.4 KB |
|
|
|
intset.py |
927 | 19 years ago | Martin Pool | - oops, set() is much faster than intset | 4.9 KB |
|
|
|
inventory.py |
1185 | 19 years ago | Martin Pool | - add xml round-trip test for revisions - fix up | 18.3 KB |
|
|
|
lock.py |
951 | 19 years ago | Martin Pool | - fix up self reference in msvc lock object | 7.6 KB |
|
|
|
log.py |
1178 | 19 years ago | Martin Pool | - merge various bug fixes from aaron aaron.bentle | 11.4 KB |
|
|
|
mdiff.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 3.8 KB |
|
|
|
merge.py |
974.1.88 | 19 years ago | Aaron Bentley | Set a pending_merge if the merge base is forced to | 15.8 KB |
|
|
|
merge3.py |
974.1.52 | 19 years ago | aaron.bentley at utoronto | Merged mpool's latest changes (~0.0.7) | 11.9 KB |
|
|
|
merge_core.py |
974.1.50 | 19 years ago | aaron.bentley at utoronto | Merge of robertc@robertcollins.net-20050826013321- | 10.1 KB |
|
|
|
meta_store.py |
974.1.77 | 19 years ago | Aaron Bentley | Fixed branch handling of missing revisions | 1.7 KB |
|
|
|
missing.py |
1149 | 19 years ago | Martin Pool | - make get_parent() be a method of Branch; add sim | 2.7 KB |
|
|
|
msgeditor.py |
1185.1.2 | 19 years ago | Martin Pool | - merge various windows and other fixes from Ollie | 3.7 KB |
|
|
|
newinventory.py |
909 | 19 years ago | Martin Pool | - merge John's code to give the tree root an expli | 4.3 KB |
|
|
|
osutils.py |
1167 | 19 years ago | Martin Pool | - split commit message editor functions out into o | 11.6 KB |
|
|
|
patch.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 1.8 KB |
|
|
|
plugin.py |
1136 | 19 years ago | Martin Pool | - better debug log for loading of plugins | 4.6 KB |
|
|
|
progress.py |
1092.1.39 | 19 years ago | Robert Collins | merge from mpool | 9.2 KB |
|
|
|
remotebranch.py |
974.1.78 | 19 years ago | Aaron Bentley | Narrowed exception handling for remote file retrie | 5.7 KB |
|
|
|
revfile.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 17.8 KB |
|
|
|
revision.py |
974.1.88 | 19 years ago | Aaron Bentley | Set a pending_merge if the merge base is forced to | 11.3 KB |
|
|
|
shellcomplete.py |
1091 | 19 years ago | Martin Pool | - new shell-complete command to help zsh completio | 1.9 KB |
|
|
|
status.py |
1185.3.1 | 19 years ago | Martin Pool | - docstring fix from Magnus Therning | 2.4 KB |
|
|
|
store.py |
974.1.77 | 19 years ago | Aaron Bentley | Fixed branch handling of missing revisions | 7.6 KB |
|
|
|
textinv.py |
236 | 19 years ago | mbp at sourcefrog | - Experiments in inventory performance | 2.5 KB |
|
|
|
textui.py |
426 | 19 years ago | Martin Pool | - Skip symlinks during recursive add (path from aa | 1.1 KB |
|
|
|
trace.py |
1139 | 19 years ago | Martin Pool | - merge in merge improvements and additional tests | 5.9 KB |
|
|
|
tree.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 11.1 KB |
|
|
|
ui.py |
1092.1.39 | 19 years ago | Robert Collins | merge from mpool | 1.4 KB |
|
|
|
upgrade.py |
1182 | 19 years ago | Martin Pool | - more disentangling of xml storage format from ob | 5.2 KB |
|
|
|
weave.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 28.6 KB |
|
|
|
weavefile.py |
1092.1.39 | 19 years ago | Robert Collins | merge from mpool | 4.1 KB |
|
|
|
workingtree.py |
1140 | 19 years ago | Martin Pool | - lift out import statements within WorkingTree | 8.9 KB |
|
|
|
xml.py |
1184 | 19 years ago | Martin Pool | - fix v5 packing of inventory entries add test | 11.2 KB |
|
|