~bzr-pqm/bzr/bzr.dev

  • Committer: Vincent Ladeuil
  • Date: 2010-09-16 16:13:18 UTC
  • mto: (5502.1.1 trunk)
  • Revision ID: v.ladeuil+lp@free.fr-20100916161318-c9k41sne1m12rxl9
Add ``bzrlib.transform.orphan_policy`` and allows ``never`` to restore the previous behaviour.

* bzrlib/transform.py:
(TreeTransformBase._get_potential_orphans): Simplified.
(DiskTreeTransform.new_orphan): Use the orphaning_registry.
(refuse_orphan): Implement the previous behaviour (never orphan).
(conflict_pass): Clarify orphan creation and fallback on error.

* bzrlib/tests/test_transform.py:
(TestOrphan.test_never_orphan): Add more tests to cover no
orphaning and orphaning errors.
Filename Latest Rev Last Changed Committer Comment Size
..
images 2977.1.1 17 years ago Ian Clatworthy First cut at new look User Guide including chapter Diff
adv_merging.txt 4798.6.3 15 years ago Neil Martinsen-Burrell Add discussion of conflicts 5.2 KB Diff Download File
annotating_changes.txt 3309.1.1 16 years ago Ian Clatworthy Reduce evangelism in the User Guide 1 KB Diff Download File
bazaar_workflows.txt 3309.1.1 16 years ago Ian Clatworthy Reduce evangelism in the User Guide 6.1 KB Diff Download File
branching_a_project.txt 5278.1.5 14 years ago Martin Pool Correct more sloppy use of the term 'Linux' 4.7 KB Diff Download File
browsing_history.txt 4634.39.41 15 years ago Ian Clatworthy Fix the broken links in the User Guide 3.2 KB Diff Download File
bug_trackers.txt 4857.3.1 15 years ago Patrick Regan fix broken link to user-reference 2.5 KB Diff Download File
bzrtools_plugin.txt 5050.22.1 14 years ago John Arbash Meinel Lots of documentation updates. We had a lot of ht 762 bytes Diff Download File
central_intro.txt 2977.1.6 17 years ago Ian Clatworthy first cut at Central development chapter 1.1 KB Diff Download File
configuring_bazaar.txt 5335.2.3 14 years ago Martin Pool Document no_proxy 2.9 KB Diff Download File
controlling_registration.txt 4853.1.1 15 years ago Patrick Regan Removed trailing whitespace from files in doc dire 3.7 KB Diff Download File
core_concepts.txt 4634.39.41 15 years ago Ian Clatworthy Fix the broken links in the User Guide 4.2 KB Diff Download File
distributed_intro.txt 4853.1.1 15 years ago Patrick Regan Removed trailing whitespace from files in doc dire 655 bytes Diff Download File
entering_commands.txt 2977.1.18 17 years ago Ian Clatworthy chapter 2 tweaks 1.2 KB Diff Download File
filtered_views.txt 4634.81.1 15 years ago Ian Clatworthy remove out of date format information in filtered 4.3 KB Diff Download File
getting_help.txt 4676.6.2 15 years ago Martin Pool Clearer docs about bzr help. (Thanks to Naoki) 501 bytes Diff Download File
hooks.txt 5377.1.1 14 years ago Andrew Bennetts Fix typo in merge hook example. 3.4 KB Diff Download File
http_smart_server.txt 5053.3.3 14 years ago Agustin Henze - TiN Added suggestions for Andrew Bennetts and revised 9.6 KB Diff Download File
index-plain.txt 5193.6.27 14 years ago Vincent Ladeuil Merge unify-confs into texinfo 2.6 KB Diff Download File
index.txt 5193.5.8 14 years ago Vincent Ladeuil Revert previous change as I can't reproduce the re 2 KB Diff Download File
installing_bazaar.txt 5050.22.1 14 years ago John Arbash Meinel Lots of documentation updates. We had a lot of ht 3.5 KB Diff Download File
introducing_bazaar.txt 5050.22.1 14 years ago John Arbash Meinel Lots of documentation updates. We had a lot of ht 5.9 KB Diff Download File
merging_changes.txt 4634.39.41 15 years ago Ian Clatworthy Fix the broken links in the User Guide 3.1 KB Diff Download File
organizing_branches.txt 4031.3.2 15 years ago Matt Nordhoff Merge bzr.dev, fixing conflicts. 2.7 KB Diff Download File
organizing_your_workspace.txt 4634.39.44 15 years ago Ian Clatworthy more link fixes in the User Guide 4.7 KB Diff Download File
part2_intro.txt 3427.1.2 16 years ago John Arbash Meinel Merge in bzr-1.5 623 bytes Diff Download File
partner_intro.txt 3431.4.3 16 years ago Benjamin Rister 'Straitjacket' isn't hyphenated 1.5 KB Diff Download File
plugins.txt 5050.22.1 14 years ago John Arbash Meinel Lots of documentation updates. We had a lot of ht 3.7 KB Diff Download File
publishing_a_branch.txt 4852.2.1 15 years ago David Roberts Delete unnecessary PUSH of a CHECKOUT 2.5 KB Diff Download File
recording_changes.txt 4853.1.1 15 years ago Patrick Regan Removed trailing whitespace from files in doc dire 3.3 KB Diff Download File
releasing_a_project.txt 4031.3.1 15 years ago Frank Aspell Fixing various typos 1.5 KB Diff Download File
resolving_conflicts.txt 4853.1.1 15 years ago Patrick Regan Removed trailing whitespace from files in doc dire 2.7 KB Diff Download File
reusing_a_checkout.txt 3918.1.1 15 years ago Martin Pool In user guide, use 'PROJECT' as a metavariable not 3.1 KB Diff Download File
reviewing_changes.txt 4853.1.1 15 years ago Patrick Regan Removed trailing whitespace from files in doc dire 1.9 KB Diff Download File
sending_changes.txt 4853.1.1 15 years ago Patrick Regan Removed trailing whitespace from files in doc dire 2.8 KB Diff Download File
server.txt 5050.22.1 14 years ago John Arbash Meinel Lots of documentation updates. We had a lot of ht 3.5 KB Diff Download File
setting_up_email.txt 5278.1.5 14 years ago Martin Pool Correct more sloppy use of the term 'Linux' 3.9 KB Diff Download File
shared_repository_layouts.txt 5050.22.1 14 years ago John Arbash Meinel Lots of documentation updates. We had a lot of ht 15.3 KB Diff Download File
shelving_changes.txt 4853.1.1 15 years ago Patrick Regan Removed trailing whitespace from files in doc dire 2.8 KB Diff Download File
solo_intro.txt 4011.6.1 15 years ago Frank Aspell Fixed typos. Fixed some typos in bzr doc's using 1016 bytes Diff Download File
specifying_revisions.txt 4852.3.3 15 years ago John Arbash Meinel Strip trailing whitespace from doc files by Patric 4.8 KB Diff Download File
stacked.txt 5110.1.1 14 years ago Martin Pool Merge 2.1.1, especially the fetch format warning, 4.3 KB Diff Download File
starting_a_project.txt 2977.1.11 17 years ago Ian Clatworthy make fixes suggested by proof-readers 1.8 KB Diff Download File
svn_plugin.txt 5050.22.1 14 years ago John Arbash Meinel Lots of documentation updates. We had a lot of ht 3.8 KB Diff Download File
undoing_mistakes.txt 4798.3.1 15 years ago Neil Martinsen-Burrell fix broken link in User Guide 5.3 KB Diff Download File
using_aliases.txt 4031.3.2 15 years ago Matt Nordhoff Merge bzr.dev, fixing conflicts. 2 KB Diff Download File
using_checkouts.txt 4634.39.44 15 years ago Ian Clatworthy more link fixes in the User Guide 3.5 KB Diff Download File
using_gatekeepers.txt 4011.6.1 15 years ago Frank Aspell Fixed typos. Fixed some typos in bzr doc's using 1.8 KB Diff Download File
version_info.txt 5278.1.5 14 years ago Martin Pool Correct more sloppy use of the term 'Linux' 3.7 KB Diff Download File
web_browsing.txt 5050.22.1 14 years ago John Arbash Meinel Lots of documentation updates. We had a lot of ht 485 bytes Diff Download File
working_offline_central.txt 3074.1.3 17 years ago Ian Clatworthy more feedback from jameinel 1.9 KB Diff Download File
writing_a_plugin.txt 5168.2.1 14 years ago Andrew Bennetts Add example merge_file_content hook based on my an 2 KB Diff Download File
zen.txt 4853.1.1 15 years ago Patrick Regan Removed trailing whitespace from files in doc dire 7.9 KB Diff Download File