/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/resolving_conflicts.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/resolving_conflicts.txt
35
35
each file in question, fixing the relevant areas and removing the
36
36
conflict markers as you go.
37
37
 
38
 
After fixing all the files in conflict, and removing the markers,
 
38
After fixing all the files in conflict, and removing the markers, 
39
39
ask Bazaar to mark them as resolved using the ``resolve`` command like this::
40
40
 
41
41
  bzr resolve