Mercurial > evolve
comparison tests/test-evolve-phase-divergence.t @ 4448:ab5bc57ba897
tests: create "private" repository in already-updated state
I'm going to add more copies of the repo and it's easier to work with
the repo if it's already been updated.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 12 Mar 2019 09:48:05 -0700 |
| parents | 5300be965515 |
| children | 444e664616c7 |
comparison
equal
deleted
inserted
replaced
| 4447:5205e3dedafc | 4448:ab5bc57ba897 |
|---|---|
| 26 $ evolvepath=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/ | 26 $ evolvepath=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/ |
| 27 | 27 |
| 28 Setting up a private non-publishing repo | 28 Setting up a private non-publishing repo |
| 29 ---------------------------------------- | 29 ---------------------------------------- |
| 30 | 30 |
| 31 $ hg clone -U public private | 31 $ hg clone public private |
| 32 updating to branch default | |
| 33 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 32 $ cd private | 34 $ cd private |
| 33 $ cat >> .hg/hgrc <<EOF | 35 $ cat >> .hg/hgrc <<EOF |
| 34 > [extensions] | 36 > [extensions] |
| 35 > evolve = $evolvepath | 37 > evolve = $evolvepath |
| 36 > [ui] | 38 > [ui] |
| 50 ------------------------------------- | 52 ------------------------------------- |
| 51 | 53 |
| 52 Alice creating a draft changeset and pushing to main private repo | 54 Alice creating a draft changeset and pushing to main private repo |
| 53 | 55 |
| 54 $ cd alice | 56 $ cd alice |
| 55 $ hg update | |
| 56 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 57 $ echo a >> a | 57 $ echo a >> a |
| 58 $ hg commit -u alice -m 'modify a' | 58 $ hg commit -u alice -m 'modify a' |
| 59 $ hg push ../private | 59 $ hg push ../private |
| 60 pushing to ../private | 60 pushing to ../private |
| 61 searching for changes | 61 searching for changes |
| 84 (run 'hg update' to get a working copy) | 84 (run 'hg update' to get a working copy) |
| 85 | 85 |
| 86 $ hg glog | 86 $ hg glog |
| 87 o 1:4d1169d82e47 modify a | 87 o 1:4d1169d82e47 modify a |
| 88 | () draft | 88 | () draft |
| 89 o 0:d3873e73d99e init | 89 @ 0:d3873e73d99e init |
| 90 () public | 90 () public |
| 91 | 91 |
| 92 $ hg push ../public | 92 $ hg push ../public |
| 93 pushing to ../public | 93 pushing to ../public |
| 94 searching for changes | 94 searching for changes |
| 98 added 1 changesets with 1 changes to 1 files | 98 added 1 changesets with 1 changes to 1 files |
| 99 | 99 |
| 100 $ hg glog | 100 $ hg glog |
| 101 o 1:4d1169d82e47 modify a | 101 o 1:4d1169d82e47 modify a |
| 102 | () public | 102 | () public |
| 103 o 0:d3873e73d99e init | 103 @ 0:d3873e73d99e init |
| 104 () public | 104 () public |
| 105 | 105 |
| 106 *But* Alice decided to amend the changeset she had and then pulling from public | 106 *But* Alice decided to amend the changeset she had and then pulling from public |
| 107 repo creating phase-divergent changeset locally | 107 repo creating phase-divergent changeset locally |
| 108 | 108 |