/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

From Revision 1545.2.6 to 1532

expand all expand all

Rev   Summary Authors Date Diff Files
1545.2.6
Removed _merge, renamed MergeConflictHandler to _MergeConfli...
Aaron Bentley 19 years ago Diff Files
1545.2.5
More PEP8 fixes
Aaron Bentley 19 years ago Diff Files
1545.2.4
PEP8 fixes
Aaron Bentley 19 years ago Diff Files
1545.2.3
Updated following j-a-meinel's comments
Aaron Bentley 19 years ago Diff Files
1545.2.2
Oops. Forgot _merge.py
Aaron Bentley 19 years ago Diff Files
1545.2.1
Made the merge internals private
Aaron Bentley 19 years ago Diff Files
1545
[merge] Hold locks around diff to prevent thrashing stat-cac...
Martin Pool 19 years ago Diff Files
1544
Bump version to 0.8pre
Martin Pool 19 years ago Diff Files
1543
[merge] robertc-integration
Martin Pool 19 years ago Diff Files
1542
[merge] hashcache and related cleanups from Denys
Martin Pool 19 years ago Diff Files
1541
doc
Martin Pool 19 years ago Diff Files
1540
[merge] Move in tutorial text from wiki.
Martin Pool 19 years ago Diff Files
1539
Prepare for 0.7rc1 release
Martin Pool 19 years ago Diff Files
1538
ignore .sw[nop] by default
Martin Pool 19 years ago Diff Files
1537
Don't ignore Makefile.in by default (#6413)
Martin Pool 19 years ago Diff Files
1536
[merge] robertc
Martin Pool 19 years ago Diff Files
1535
todo idea from John
Martin Pool 19 years ago Diff Files
1534
Add BRANCH.TODO, and update Makefile to clean pyo files.
Robert Collins 19 years ago Diff Files
1533
Merge Aarons integration branch.
Robert Collins 19 years ago Diff Files
1532
Merge in John Meinels integration branch.
Robert Collins 19 years ago Diff Files