/brz/remove-bazaar

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

« back to all changes in this revision

Viewing changes to doc/en/user-guide/merging_changes.txt

  • Committer: John Arbash Meinel
  • Date: 2007-12-13 20:17:06 UTC
  • mto: This revision was merged to the branch mainline in revision 3121.
  • Revision ID: john@arbash-meinel.com-20071213201706-nt8f4om80gyn6l6v
Fix LockableFiles to not use modes that allow the user to write to things they create.
It seems that cygwin + FAT32 will report all directories as readonly,
even though they are not.
Regardless, someone might have .bzr/repository as readonly, but still
allow you to create files in a subdirectory.
Either way, there is no reason to have a file that we are going to
write to be created readonly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/merging_changes.txt
53
53
 
54
54
Note that some merges can only be completed with the assistance
55
55
of a human. Details on how to resolve these are given in
56
 
`Resolving conflicts <resolving_conflicts.html>`_.
 
56
`Resolving conflicts`_.
57
57
 
58
58
Recording a merge
59
59
-----------------