← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/whats-new/whats-new-in-2.3.txt

  • Committer: Vincent Ladeuil
  • Date: 2010-10-15 15:05:09 UTC
  • mfrom: (5409.1.25 orphan-config-option)
  • mto: This revision was merged to the branch mainline in revision 5504.
  • Revision ID: v.ladeuil+lp@free.fr-20101015150509-cigmjyo1florh3d7
Merge lp:~vila/bzr/323111-orphan-config-option

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/whats-new/whats-new-in-2.3.txt
98
98
  to bug reports. (Vincent Ladeuil)
99
99
 
100
100
 
 
101
Improved conflict handling
 
102
**************************
 
103
 
 
104
* ``pull``, ``merge`` or ``switch`` can lead to conflicts when deleting a
 
105
  versioned directory contains unversioned files. The cause of the conflict
 
106
  is that deleting the directory will orphan the unversioned files so the
 
107
  user needs to instruct ``bzr`` what do to do about these orpahns. This is
 
108
  controlled by setting the ``bzr.transform.orphan_policy`` configuration
 
109
  variable with a value of ``move``. In this case the unversioned files are
 
110
  moved to a ``bzr-orphans`` directory at the root of the working tree. The
 
111
  default behaviour is specified (if needed) by setting the variable to
 
112
  ``conflict``.  (Vincent Ladeuil, #323111)
 
113
 
101
114
Documentation
102
115
*************
103
116