← Back to branch summary

~bzr-pqm/bzr/bzr.dev

From Revision 1185.14.10 to 1185.10.1

expand all expand all

Rev   Summary Authors Date Diff Files
1185.14.10
Commit aborts with conflicts in the tree.
Aaron Bentley 19 years ago Diff Files
1185.14.9
Added tests for 'bzr conflicts', 'bzr resolve'
Aaron Bentley 19 years ago Diff Files
1185.14.8
Added test_commit.py
Aaron Bentley 19 years ago Diff Files
1185.14.7
merged my own changes
Aaron Bentley 19 years ago Diff Files
1185.14.6
Made iter_conflicts a WorkingTree method
Aaron Bentley 19 years ago Diff Files
1185.14.5
Fixed relpath bug with resolve
Aaron Bentley 19 years ago Diff Files
1185.14.4
Registered conflicts, resolve functions
Aaron Bentley 19 years ago Diff Files
1185.14.3
Copied conflict lister in
Aaron Bentley 19 years ago Diff Files
1185.14.2
Merge from mpool
Aaron Bentley 19 years ago Diff Files
1185.14.1
Merged bzr.24 fixes
Aaron Bentley 19 years ago Diff Files
1185.12.2
Merged the weave changes
Aaron Bentley 19 years ago Diff Files
1185.12.1
Fixed export
Aaron Bentley 19 years ago Diff Files
1185.10.8
Conflict handling where OTHER is deleted
Aaron Bentley 19 years ago Diff Files
1185.10.7
Fixed bug where pull throws DivergedBranches if branch is ne...
Aaron Bentley 19 years ago Diff Files
1185.10.6
Removed debug code
Aaron Bentley 19 years ago Diff Files
1185.10.5
Fixed hardlinks_good test
Aaron Bentley 19 years ago Diff Files
1185.10.4
Disabled hardlinks on cygwin, mac OS
Aaron Bentley 19 years ago Diff Files
1185.10.3
Made copy_multi_immutable create hardlinks opportunistically
Aaron Bentley 19 years ago Diff Files
1185.10.2
Updated help message
Aaron Bentley 19 years ago Diff Files
1185.10.1
Added --basis option to bzr branch
Aaron Bentley 19 years ago Diff Files