/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

Fix ftp transport so that it handles the 'mode' parameter when provided.

* ftp.py:
(FtpTransport.put_file, FtpTransport.mkdir,
FtpTransport._try_append): Use _setmode.
(FtpTransport._setmode): Fix implementation (parameters were
reversed and mode not converted).

* ftp_server.py:
(test_filesystem): New filesystem implementing chmod.
(test_authorizer.authorize): Use our filesystem when authorized.
(ftp_channel.cmd_site): Implement SITE CHOWN.

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
-----------------