← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/ja/user-guide/reusing_a_checkout.txt

resolve conflicts against trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/ja/user-guide/reusing_a_checkout.txt
60
60
 
61
61
  bzr init-repo --no-trees PROJECT
62
62
  cd PROJECT
63
 
  bzr branch sftp://centralhost/srv/bzr/PROJECT/trunk
 
63
  bzr branch bzr+ssh://centralhost/srv/bzr/PROJECT/trunk
64
64
  bzr checkout --lightweight trunk my-sandbox
65
65
  cd my-sandbox
66
66
  (hack away)
71
71
応じてそれらの間で切り替えることができます。例です::
72
72
 
73
73
  (my-sandboxの中にいることを前提とする)
74
 
  bzr branch sftp://centralhost/srv/bzr/PROJECT/PROJECT-1.0 ../PROJECT-1.0
 
74
  bzr branch bzr+ssh://centralhost/srv/bzr/PROJECT/PROJECT-1.0 ../PROJECT-1.0
75
75
  bzr switch ../PROJECT-1.0
76
76
  (fix bug in 1.0)
77
77
  bzr commit -m "blah, blah blah"