# Plan for demonstration.

# repository for Bob
hg init bob
cd bob
cp ../hello-0/* .
hg status
hg add
hg commit -m 'Initial import.'
hg rollback
# edit .hg/hgrc
hg commit -m 'Initial import.'
hg status

# create shared repo
cd ..
hg clone bob shared

# switch to Alice
hg clone shared alice
cd alice
gedit .hg/hgrc # set username

# edit hello.c
hg status
hg diff
# add color to .hg/hgrc
hg diff
hg commit -m 'Better output.'
hg status
# edit .hgignore
hg add .hgignore
hg commit -m 'Ignore backup files.'

hg outgoing
hg outgoing -p
hg push # push to shared

# switch to Bob

hg incoming
hg pull
hg update
# edit hello.c
hg commit -m 'Added comments.'
hg push

# switch to Alice
# edit hello.c, add "Nice meeting you!"
hg diff
hg commit -m 'Added friendly greeting.'
hg outgoing
hg push # abort due to multiple heads
hg pull
hg heads
hg merge
hg commit -m 'Merged.'
hg outgoing
hg push

# switch to Bob
hg pull # get merge changeset
hg update
# Bob branches off for the 1.0 release
hg branch 1.x
# edit hello.c (stabilization) "Hello 1.0 World"
hg tag 1.0
hg push # to shared

# switch to Alice, continue work on trunk
# edit hello.c "Hello Crazy World"
hg commit -m 'Crazy new feature.'
hg pull
# merge stabilizing change
hg merge 1.x
# conflicts!
hg resolve --list
# resolve conflict in hello.c
hg resolve -m hello.c
hg commit -m 'Merge with 1.x.'

# backport
# edit goodbye.c
hg add goodbye.c
hg commit -m 'Goodbye feature.'
hg tip # note revision number for transplant

# add transplant extension .hg/hgrc
hg update 1.x
hg transplant REV
hg update default
hg merge 1.x
hg commit -m 'Merge with 1.x.'