КонстрПЗ_ПI_ЛР2014_ч2

23

. A , i Mercurial, i 0 (

0) :

> hg add

adding readme.txt

2 i :

> hg status A readme.txt

x , * ' «4»,

K i * readme.txt 0

* ( ), K 0 -

0:

> hg commit

Mercurial

. x , -

' . &

:

>, i Mercurial . Changeset

— K , K :

( «:») * (sha1-e). @-

e ' -

, - 0 0 . 4,

K - * ', ' -, i K . - * 4-5 e * *. ;-

«tag: tip», tip – ,

K -

. K .

2.2.3 %$ %$. 1$ #%$!$r % Mercurial

x e 0 0 ,

Mercurial K , K changeset. '

24

* 0 0 '

' ,

0 . 5 ' -

- K *, Mercurial 40-Š sha1-e, K . < -

, ' -

*.

2.2.4 1$ ! %$.. /# 1 # ! $Z1

x i, « »

, K K

. & ,

' . A , i

, e ~/repos/hgproject , -

:

> hg push

pushing to ~/repos/hgproject searching for changes adding changesets

adding manifests adding file changes

added 1 changesets with 1 changes to 1 files

& K , * -

, * 0 ' . A

' i , , - K Mercurial. A '

, , ~/projects/hgproj_clone, -

:

>hg clone ~/repos/hgproject ~/projects/hgproj_clone updating working directory

1 files updated, 0 files merged, 0 files removed, 0 files unresolved

' *,

, other.txt 0 - . 2

, i:

>hg status ? other.txt

>hg add

adding other.txt > hg commit

' , i ' ,

, , ,

e 0 push. < '

i K 0:

> hg outgoing

comparing with ~/repos/hgproject searching for changes

0 hg outgoing Mercurial , K

, K « ». < ' , i ' , « »

' :

> hg push

pushing to ~/repos/hgproject searching for changes adding changesets

adding manifests adding file changes

added 1 changesets with 1 changes to 1 files

< , « . <

, . A

e ,

~/projects/hgproject, :

> hg incoming

comparing with ~/repos/hgproject searching for changes changeset: 1:270e49e72f4b

tag: tip

user: mike@mike-notebook

26

/ «hg incoming» K , K

, . 4 ' '

, :

> hg pull

pulling from ~/repos/hgproject searching for changes

adding changesets adding manifests adding file changes

added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy)

/ «hg pull» ' K ,

K , , « » -

i . 4 e

, e 0. A

, i 0,

:

> hg update

1 files updated, 0 files merged, 0 files removed, 0 files unresolved

x i , K

~/projects/hgproj_clone, i

K .

< , 0 0 -

0 , i ’ , -

0 K 0

' , i K-

i (commit-push/pull-update). < -

K , -, , , .

2.2.5 G !] / s# Z #1$ " /2 %#$3 Mercurial

e

, – ' . > e * 2 . & e -

', e , i 0K Mercurial –

' ' . ? K, -

27

K *, , (

) * " " -

. 0K 0 -

, ‹> B3. ' , i

' , -

" ". ? K -

, i .

A * first.txt e , -

:

$ echo "new text to first.txt" > first.txt $ hg status

? first.txt

$ hg add first.txt $ hg commit

$ hg outgoing

comparing with /home/mike/Repositories/newProject searching for changes

pushing to /home/mike/Repositories/newProject searching for changes

adding changesets adding manifests adding file changes

added 1 changesets with 1 changes to 1 files

4 0K 0, ' , i

0 , e K-

Mercurial,

0. A

*. ; '

, K Mercurial.

$ echo "file created in second repository" > second.txt $ hg status

? second.txt $ hg add

adding second.txt $ hg commit

$ hg log

changeset: 2:6872fa960507

< , ' K ,

0 " " , 0 -

, K. - 0

– ', , K

. A e

" " .

$ hg outgoing

comparing with /home/mike/Repositories/newProject searching for changes

$ hg push

pushing to /home/mike/Repositories/newProject searching for changes

abort: push creates new remote heads!

(did you forget to merge? use push -f to force)

< , Mercurial K e, K, i push

. 2 -

K 'K . A -

.

$ hg incoming

comparing with /home/mike/Repositories/newProject searching for changes

changeset: 2:66c5686e355e

29

$ hg pull

pulling from /home/mike/Repositories/newProject searching for changes

adding changesets adding manifests adding file changes

added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge)

„ " " , Mercuial K, i " ",

0 (' to merge). '

, i Mercurial ( - K graphlog), i K e -

.

30

; " " K 0, i . 5 0

. '

.

< , Mercurial, "hg merge" 'K -

0 , K, i -.

$ hg commit $ hg glog

@changeset: 4:6d6c634e2e20

; , K Mercurial , i '

K. < ' , i -

" ", e. @ Mercrurial

' e , i . < '