test-issue1502.t
43 lines
| 1.2 KiB
| text/troff
|
Tads3Lexer
/ tests / test-issue1502.t
Matt Mackall
|
r26420 | https://bz.mercurial-scm.org/1502 | ||
David Soria Parra
|
r13478 | |||
Initialize repository | ||||
$ hg init foo | ||||
$ touch foo/a && hg -R foo commit -A -m "added a" | ||||
adding a | ||||
$ hg clone foo foo1 | ||||
updating to branch default | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ echo "bar" > foo1/a && hg -R foo1 commit -m "edit a in foo1" | ||||
$ echo "hi" > foo/a && hg -R foo commit -m "edited a foo" | ||||
Pierre-Yves David
|
r28064 | $ hg -R foo1 pull | ||
Matt Harbison
|
r35394 | pulling from $TESTTMP/foo | ||
David Soria Parra
|
r13478 | searching for changes | ||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
Denis Laxalde
|
r34662 | new changesets 273d008d6e8e | ||
Pierre-Yves David
|
r28064 | (run 'hg heads' to see heads, 'hg merge' to merge) | ||
David Soria Parra
|
r13478 | |||
$ hg -R foo1 book branchy | ||||
$ hg -R foo1 book | ||||
* branchy 1:e3e522925eff | ||||
Pull. Bookmark should not jump to new head. | ||||
$ echo "there" >> foo/a && hg -R foo commit -m "edited a again" | ||||
$ hg -R foo1 pull | ||||
Matt Harbison
|
r35394 | pulling from $TESTTMP/foo | ||
David Soria Parra
|
r13478 | searching for changes | ||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files | ||||
Denis Laxalde
|
r34662 | new changesets 84a798d48b17 | ||
David Soria Parra
|
r13478 | (run 'hg update' to get a working copy) | ||
$ hg -R foo1 book | ||||
* branchy 1:e3e522925eff | ||||