Mercurial > evolve
comparison tests/test-divergent.t @ 3154:406992d0d611
evolve: rename --contentdivergent flag to --content-divergent
This makes the whole things easier to read.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 26 Oct 2017 09:02:25 +0200 |
| parents | 945a0989e41b |
| children | e1a230cc4527 ae6fddf39933 |
comparison
equal
deleted
inserted
replaced
| 3153:544354cfc626 | 3154:406992d0d611 |
|---|---|
| 51 | | 51 | |
| 52 | o 2:c2f698071cba@default(draft) add bdivergent1 [content-divergent] | 52 | o 2:c2f698071cba@default(draft) add bdivergent1 [content-divergent] |
| 53 |/ | 53 |/ |
| 54 o 0:135f39f4bd78@default(draft) add _a [] | 54 o 0:135f39f4bd78@default(draft) add _a [] |
| 55 | 55 |
| 56 $ hg evolve --all --any --contentdivergent | 56 $ hg evolve --all --any --content-divergent |
| 57 merge:[2] add bdivergent1 | 57 merge:[2] add bdivergent1 |
| 58 with: [3] add bdivergent2 | 58 with: [3] add bdivergent2 |
| 59 base: [1] add _b | 59 base: [1] add _b |
| 60 updating to "local" conflict | 60 updating to "local" conflict |
| 61 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 61 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 96 |/ | 96 |/ |
| 97 | o 4:c26f1d3baed2@default(draft) add bdivergent1 [] | 97 | o 4:c26f1d3baed2@default(draft) add bdivergent1 [] |
| 98 |/ | 98 |/ |
| 99 o 0:135f39f4bd78@default(draft) add _a [] | 99 o 0:135f39f4bd78@default(draft) add _a [] |
| 100 | 100 |
| 101 $ hg evolve --all --any --contentdivergent | 101 $ hg evolve --all --any --content-divergent |
| 102 merge:[6] add cdivergent1 | 102 merge:[6] add cdivergent1 |
| 103 with: [7] cdivergent2 | 103 with: [7] cdivergent2 |
| 104 base: [5] add _c | 104 base: [5] add _c |
| 105 updating to "local" conflict | 105 updating to "local" conflict |
| 106 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 106 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 144 > [extensions] | 144 > [extensions] |
| 145 > testextension=$TESTTMP/test_extension.py | 145 > testextension=$TESTTMP/test_extension.py |
| 146 > EOF | 146 > EOF |
| 147 $ hg evolve --all | 147 $ hg evolve --all |
| 148 nothing to evolve on current working copy parent | 148 nothing to evolve on current working copy parent |
| 149 (do you want to use --contentdivergent) | 149 (do you want to use --content-divergent) |
| 150 [2] | 150 [2] |
| 151 $ hg evolve --contentdivergent | 151 $ hg evolve --content-divergent |
| 152 merge:[3] add bdivergent2 | 152 merge:[3] add bdivergent2 |
| 153 with: [2] add bdivergent1 | 153 with: [2] add bdivergent1 |
| 154 base: [1] add _b | 154 base: [1] add _b |
| 155 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 155 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 156 working directory is now at aa26817f6fbe | 156 working directory is now at aa26817f6fbe |