- Committer: Martin Pool
- Date: 2005-06-06 04:17:53 UTC
- Revision ID: mbp@sourcefrog.net-20050606041753-abe590daf0d7f959
Updated merge patch from Aaron
This patch contains all the changes to merge that I'd like to get into
0.5, namely
* common ancestor BASE selection
* merge reports conflicts when they are encountered
* merge refuses to operate in working trees with changes
* introduces revert command to revert the working tree to the
last-committed state
* Adds some reasonable help text
This patch contains all the changes to merge that I'd like to get into
0.5, namely
* common ancestor BASE selection
* merge reports conflicts when they are encountered
* merge refuses to operate in working trees with changes
* introduces revert command to revert the working tree to the
last-committed state
* Adds some reasonable help text
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
617 | 19 years ago | Martin Pool | - ignore .git | 2 KB |
|
|
|
add.py |
599 | 19 years ago | Martin Pool | - better error reporting from smart_add | 3 KB |
|
|
|
atomicfile.py |
565 | 19 years ago | Martin Pool | - more invariant checks in AtomicFile | 2.9 KB |
|
|
|
branch.py |
622 | 19 years ago | Martin Pool | Updated merge patch from Aaron This patch contain | 30 KB |
|
|
|
changeset.py |
622 | 19 years ago | Martin Pool | Updated merge patch from Aaron This patch contain | 52.2 KB |
|
|
|
check.py |
543 | 19 years ago | Martin Pool | - More cleanups for set type - Clean up Inventory | 4.1 KB |
|
|
|
commands.py |
622 | 19 years ago | Martin Pool | Updated merge patch from Aaron This patch contain | 38.3 KB |
|
|
|
commit.py |
610 | 19 years ago | Martin Pool | - replace Branch.lock(mode) with separate lock_rea | 8.8 KB |
|
|
|
diff.py |
622 | 19 years ago | Martin Pool | Updated merge patch from Aaron This patch contain | 13.5 KB |
|
|
|
errors.py |
614 | 19 years ago | Martin Pool | - unify two defintions of LockError | 1.9 KB |
|
|
|
help.py |
473 | 19 years ago | Martin Pool | - Don't lose first line of command help! | 4 KB |
|
|
|
info.py |
542 | 19 years ago | Martin Pool | - fix typo | 3.4 KB |
|
|
|
inventory.py |
557 | 19 years ago | Martin Pool | - Refactor/cleanup Inventory.entries() - Rewrite I | 18.7 KB |
|
|
|
lock.py |
615 | 19 years ago | Martin Pool | Major rework of locking code: - New ReadLock and | 7.2 KB |
|
|
|
log.py |
567 | 19 years ago | Martin Pool | - New form 'bzr log -r FROM:TO' patch from John | 7.3 KB |
|
|
|
mdiff.py |
225 | 19 years ago | mbp at sourcefrog | debug output | 2.2 KB |
|
|
|
merge.py |
622 | 19 years ago | Martin Pool | Updated merge patch from Aaron This patch contain | 9.7 KB |
|
|
|
merge_core.py |
622 | 19 years ago | Martin Pool | Updated merge patch from Aaron This patch contain | 19.1 KB |
|
|
|
newinventory.py |
191 | 19 years ago | mbp at sourcefrog | more XML performance tests | 4.3 KB |
|
|
|
osutils.py |
488 | 19 years ago | Martin Pool | - new helper function kind_marker() | 9.2 KB |
|
|
|
patch.py |
493 | 19 years ago | Martin Pool | - Merge aaron's merge command | 2.5 KB |
|
|
|
remotebranch.py |
613 | 19 years ago | Martin Pool | - fix locking for RemoteBranch - add RemoteBranch. | 6.7 KB |
|
|
|
revfile.py |
558 | 19 years ago | Martin Pool | - All top-level classes inherit from object (Pyt | 15.4 KB |
|
|
|
revision.py |
254 | 19 years ago | Martin Pool | - Doc cleanups from Magnus Therning | 2.7 KB |
|
|
|
selftest.py |
609 | 19 years ago | Martin Pool | - cleanup test code | 1.2 KB |
|
|
|
statcache.py |
602 | 19 years ago | Martin Pool | - new statcache format: use nul field separators r | 8.6 KB |
|
|
|
status.py |
610 | 19 years ago | Martin Pool | - replace Branch.lock(mode) with separate lock_rea | 1.8 KB |
|
|
|
store.py |
558 | 19 years ago | Martin Pool | - All top-level classes inherit from object (Pyt | 5.2 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 |
403 | 19 years ago | Martin Pool | - Don't give an error if the trace file can't be o | 3.8 KB |
|
|
|
tree.py |
558 | 19 years ago | Martin Pool | - All top-level classes inherit from object (Pyt | 7.5 KB |
|
|
|
whitebox.py |
609 | 19 years ago | Martin Pool | - cleanup test code | 1.9 KB |
|
|
|
workingtree.py |
489 | 19 years ago | Martin Pool | - WorkingTree loads statcache in constructor and h | 8.8 KB |
|
|
|
xml.py |
48 | 19 years ago | Martin Pool | witty comment | 1.5 KB |
|
|