2011-11-11 03:19:00 +04:00
|
|
|
$ cat >> $HGRCPATH <<EOF
|
|
|
|
> [extensions]
|
|
|
|
> graphlog=
|
|
|
|
> EOF
|
|
|
|
$ alias hgph='hg log --template "{rev} {phase} {desc}\n"'
|
|
|
|
|
|
|
|
$ mkcommit() {
|
|
|
|
> echo "$1" > "$1"
|
|
|
|
> hg add "$1"
|
|
|
|
> hg ci -m "$1"
|
|
|
|
> }
|
|
|
|
|
|
|
|
$ hg init alpha
|
|
|
|
$ cd alpha
|
|
|
|
$ mkcommit a-A
|
|
|
|
$ mkcommit a-B
|
|
|
|
$ mkcommit a-C
|
|
|
|
$ mkcommit a-D
|
|
|
|
$ hgph
|
|
|
|
3 1 a-D
|
|
|
|
2 1 a-C
|
|
|
|
1 1 a-B
|
|
|
|
0 1 a-A
|
|
|
|
|
|
|
|
$ hg init ../beta
|
|
|
|
$ hg push -r 1 ../beta
|
|
|
|
pushing to ../beta
|
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 2 changesets with 2 changes to 2 files
|
2011-11-11 03:21:17 +04:00
|
|
|
$ hgph
|
|
|
|
3 1 a-D
|
|
|
|
2 1 a-C
|
|
|
|
1 0 a-B
|
|
|
|
0 0 a-A
|
|
|
|
|
2011-11-11 03:19:00 +04:00
|
|
|
$ cd ../beta
|
|
|
|
$ hgph
|
|
|
|
1 0 a-B
|
|
|
|
0 0 a-A
|
|
|
|
$ hg up -q
|
|
|
|
$ mkcommit b-A
|
|
|
|
$ hgph
|
|
|
|
2 1 b-A
|
|
|
|
1 0 a-B
|
|
|
|
0 0 a-A
|
|
|
|
$ hg pull ../alpha
|
|
|
|
pulling from ../alpha
|
|
|
|
searching for changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 2 changesets with 2 changes to 2 files (+1 heads)
|
|
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
|
|
$ hgph
|
|
|
|
4 0 a-D
|
|
|
|
3 0 a-C
|
|
|
|
2 1 b-A
|
|
|
|
1 0 a-B
|
|
|
|
0 0 a-A
|
|
|
|
|
2011-11-11 03:21:17 +04:00
|
|
|
pull did not updated ../alpha state.
|
|
|
|
push from alpha to beta should update phase even if nothing is transfered
|
|
|
|
|
|
|
|
$ cd ../alpha
|
|
|
|
$ hgph # not updated by remote pull
|
|
|
|
3 1 a-D
|
|
|
|
2 1 a-C
|
|
|
|
1 0 a-B
|
|
|
|
0 0 a-A
|
|
|
|
$ hg push ../beta
|
|
|
|
pushing to ../beta
|
|
|
|
searching for changes
|
|
|
|
no changes found
|
|
|
|
$ hgph
|
|
|
|
3 0 a-D
|
|
|
|
2 0 a-C
|
|
|
|
1 0 a-B
|
|
|
|
0 0 a-A
|
2011-11-11 03:19:00 +04:00
|
|
|
|