- Committer: Aaron Bentley
- Date: 2005-09-26 15:03:16 UTC
- mto: (1185.14.1) (1393.1.21)
- Revision ID: abentley@panoramicfeedback.com-20050926150316-ed498650ab07a6ce
Fixed bug where pull throws DivergedBranches if branch is newer than upstream
| 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 |
1185.9.1 | 19 years ago | Martin Pool | - prepare for 0.0.9 release | 1.9 KB |
|
|
|
add.py |
1185.2.15 | 19 years ago | Lalo Martins | merging from Robert's integration branch | 5.3 KB |
|
|
|
atomicfile.py |
565 | 19 years ago | Martin Pool | - more invariant checks in AtomicFile | 2.9 KB |
|
|
|
branch.py |
1185.10.7 | 19 years ago | Aaron Bentley | Fixed bug where pull throws DivergedBranches if br | 45.8 KB |
|
|
|
builtins.py |
1185.10.2 | 19 years ago | Aaron Bentley | Updated help message | 43.2 KB |
|
|
|
changeset.py |
974.1.83 | 19 years ago | Aaron Bentley | Removed unused dir parameter from ExceptionConflic | 51.7 KB |
|
|
|
check.py |
1092.1.48 | 19 years ago | Robert Collins | really merge mpool | 9.9 KB |
|
|
|
commands.py |
1185.10.1 | 19 years ago | Aaron Bentley | Added --basis option to bzr branch | 21.5 KB |
|
|
|
commit.py |
1185.3.15 | 19 years ago | Martin Pool | - merge in many integration fixes from Robert * | 12.1 KB |
|
|
|
delta.py |
1185.1.20 | 19 years ago | Robert Collins | remove unneeded shebangs | 7.5 KB |
|
|
|
diff.py |
1185.4.1 | 19 years ago | Lalo Martins | blackbox tests for diff | 8.2 KB |
|
|
|
errors.py |
1185.10.1 | 19 years ago | Aaron Bentley | Added --basis option to bzr branch | 4.4 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 |
1185.8.3 | 19 years ago | Aaron Bentley | Fixed bug in distance-from-root graph operation | 3.9 KB |
|
|
|
hashcache.py |
1185.3.6 | 19 years ago | Martin Pool | - if statcache can't be read, consider that it nee | 7.6 KB |
|
|
|
help.py |
1185.3.15 | 19 years ago | Martin Pool | - merge in many integration fixes from Robert * | 4.5 KB |
|
|
|
info.py |
542 | 19 years ago | Martin Pool | - fix typo | 3.4 KB |
|
|
|
intset.py |
1185.1.20 | 19 years ago | Robert Collins | remove unneeded shebangs | 4.8 KB |
|
|
|
inventory.py |
1185.2.9 | 19 years ago | Lalo Martins | getting rid of everything that calls the Branch co | 18.3 KB |
|
|
|
lock.py |
1185.7.1 | 19 years ago | Martin Pool | - Quieten warnings about locking; patch from Matt | 7.7 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 |
1185.8.5 | 19 years ago | Aaron Bentley | Fixed non-tree-root bug in branch, revert, merge | 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 |
1185.3.15 | 19 years ago | Martin Pool | - merge in many integration fixes from Robert * | 1.7 KB |
|
|
|
missing.py |
1185.1.20 | 19 years ago | Robert Collins | remove unneeded shebangs | 2.7 KB |
|
|
|
msgeditor.py |
1185.1.30 | 19 years ago | Robert Collins | Accept and tweak David Clymers BZREDITOR support p | 3.8 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 |
1185.10.5 | 19 years ago | Aaron Bentley | Fixed hardlinks_good test | 12.4 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 |
1185.1.33 | 19 years ago | Robert Collins | for remote gets fallback from foo.gz to foo in Rem | 6.3 KB |
|
|
|
revfile.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 17.8 KB |
|
|
|
revision.py |
1185.8.1 | 19 years ago | Aaron Bentley | Ensured combined_graph is order-insensitive | 11.5 KB |
|
|
|
revisionspec.py |
1185.1.39 | 19 years ago | Robert Collins | Robey Pointers before: namespace to clear up usage | 10.4 KB |
|
|
|
shellcomplete.py |
1185.1.9 | 19 years ago | Robert Collins | Clint Adams patch for shell completion hints | 1.9 KB |
|
|
|
status.py |
1185.1.35 | 19 years ago | Robert Collins | Heikki Paajanen's status -r patch | 3.4 KB |
|
|
|
store.py |
1185.10.3 | 19 years ago | Aaron Bentley | Made copy_multi_immutable create hardlinks opportu | 7.9 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 |
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late | 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 |
1185.1.20 | 19 years ago | Robert Collins | remove unneeded shebangs | 4.1 KB |
|
|
|
workingtree.py |
1140 | 19 years ago | Martin Pool | - lift out import statements within WorkingTree | 8.9 KB |
|
|
|
xml.py |
1185.1.20 | 19 years ago | Robert Collins | remove unneeded shebangs | 11.2 KB |
|
|