Mercurial > hgrepos > hgweb.cgi > skipweb

annotate docs/howto.md @ 3889:b5f785f88f5c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changed filename .png
author Fumichan <c116092@h.koeki-u.ac.jp>
date Mon, 18 Feb 2019 13:38:28 +0900
parents 8efd5a198e02
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3664
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
1 # 編集の流れ
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
2 この説明は既に[事前準備](../../master/README.md)をみて、
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
3 MercurialあるいはGitの運用設定が終わって、
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
4 クローンも完了している場合のものである。
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
5
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
6 ## 大きな流れ
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
7 分散リポジトリを利用して運用している場合、
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
8 他の作業者も同じように編集をしている場合を考え、
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
9 _つねに_ 他者による更新に追随することに心掛ける。
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
10
3675
8efd5a198e02 Refer ti ssg-agent
HIROSE Yuuji <yuuji@yatex.org>
parents: 3665
diff changeset
11 作業に先だって、SSH鍵のパスフレーズを記憶してくれる ssh-agent を動かしておくとよい。
8efd5a198e02 Refer ti ssg-agent
HIROSE Yuuji <yuuji@yatex.org>
parents: 3665
diff changeset
12 ~~~
8efd5a198e02 Refer ti ssg-agent
HIROSE Yuuji <yuuji@yatex.org>
parents: 3665
diff changeset
13 % ssh-agent zsh
8efd5a198e02 Refer ti ssg-agent
HIROSE Yuuji <yuuji@yatex.org>
parents: 3665
diff changeset
14 % ssh-add
8efd5a198e02 Refer ti ssg-agent
HIROSE Yuuji <yuuji@yatex.org>
parents: 3665
diff changeset
15 (パスフレーズを打つ)
8efd5a198e02 Refer ti ssg-agent
HIROSE Yuuji <yuuji@yatex.org>
parents: 3665
diff changeset
16 ~~~
8efd5a198e02 Refer ti ssg-agent
HIROSE Yuuji <yuuji@yatex.org>
parents: 3665
diff changeset
17 これ以後、パスフレーズの必要な部分で、
8efd5a198e02 Refer ti ssg-agent
HIROSE Yuuji <yuuji@yatex.org>
parents: 3665
diff changeset
18 ssh-agent が代わりに打ってくれる。
8efd5a198e02 Refer ti ssg-agent
HIROSE Yuuji <yuuji@yatex.org>
parents: 3665
diff changeset
19
3664
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
20 1. まずリポジトリから最新バージョンを取り寄せる
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
21 ~~~
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
22 : Mercurial
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
23 % hg pull --rebase -uv
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
24 : Git
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
25 % git pull
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
26 ~~~
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
27 2. 手元のファイルを編集し終わったらコミットする
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
28 ~~~
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
29 Emacsで編集していれば C-x v v
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
30 コマンドラインでやるなら
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
31 : Mercurial
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
32 % hg ci -m 'コミットメッセージ'
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
33 : Git
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
34 % git ci -m 'コミットメッセージ' -a
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
35 ~~~
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
36 **コミットメッセージは「何をどう変えたか」分かるような文にすること**
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
37 3. 念のためもう一度取り寄せる(hg pull/git pull)
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
38 4. すぐにサーバにpushする
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
39 ~~~
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
40 : Mercurial
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
41 % hg push
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
42 : Git
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
43 % git push
360dc6e0e204 Describe flow of editting with DVCS
HIROSE Yuuji <yuuji@gentei.org>
parents: 3663
diff changeset
44 ~~~

yatex.org