Mercurial > evolve
comparison tests/test-evolve-content-divergent-basic.t @ 4516:f54bb6eaf5e6 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 11 Apr 2019 22:44:53 +0200 |
| parents | d70db7e455dc |
| children | aafd51f145ea |
comparison
equal
deleted
inserted
replaced
| 4514:ef1c322c389d | 4516:f54bb6eaf5e6 |
|---|---|
| 105 | 105 |
| 106 $ hg prune -s 8374d2ddc3a4 "desc('added b')" | 106 $ hg prune -s 8374d2ddc3a4 "desc('added b')" |
| 107 1 changesets pruned | 107 1 changesets pruned |
| 108 $ hg prune -s 593c57f2117e "desc('added b')" --hidden | 108 $ hg prune -s 593c57f2117e "desc('added b')" --hidden |
| 109 1 changesets pruned | 109 1 changesets pruned |
| 110 2 new content-divergent changesets | |
| 111 | 110 |
| 112 $ hg log -G --patch | 111 $ hg log -G --patch |
| 113 @ 3:8374d2ddc3a4@default(draft) divergent [content-divergent] | 112 @ 3:8374d2ddc3a4@default(draft) divergent [content-divergent] |
| 114 | diff --git a/bdivergent2 b/bdivergent2 | 113 | diff --git a/bdivergent2 b/bdivergent2 |
| 115 | new file mode 100644 | 114 | new file mode 100644 |
| 116 | --- /dev/null | 115 | --- /dev/null |
| 117 | +++ b/bdivergent2 | 116 | +++ b/bdivergent2 |
| 118 | @@ -0,0 +1,1 @@ | 117 | @@ -0,0 +1,1 @@ |
| 119 | +bdivergent | 118 | +bdivergent |
| 120 | | 119 | |
| 121 | * 2:593c57f2117e@default(draft) divergent [content-divergent] | 120 | o 2:593c57f2117e@default(draft) divergent [content-divergent] |
| 122 |/ diff --git a/bdivergent1 b/bdivergent1 | 121 |/ diff --git a/bdivergent1 b/bdivergent1 |
| 123 | new file mode 100644 | 122 | new file mode 100644 |
| 124 | --- /dev/null | 123 | --- /dev/null |
| 125 | +++ b/bdivergent1 | 124 | +++ b/bdivergent1 |
| 126 | @@ -0,0 +1,1 @@ | 125 | @@ -0,0 +1,1 @@ |
| 270 $ echo bar > d | 269 $ echo bar > d |
| 271 $ hg ci -Aqm "added a d with bar in it, expect some beers" | 270 $ hg ci -Aqm "added a d with bar in it, expect some beers" |
| 272 | 271 |
| 273 $ hg prune -r 0ac42f1bc15c -s . --hidden | 272 $ hg prune -r 0ac42f1bc15c -s . --hidden |
| 274 1 changesets pruned | 273 1 changesets pruned |
| 275 2 new content-divergent changesets | |
| 276 | 274 |
| 277 $ hg glog | 275 $ hg glog |
| 278 @ 9:59081c9c425a added a d with bar in it, expect some beers | 276 @ 9:59081c9c425a added a d with bar in it, expect some beers |
| 279 | () [default] draft | 277 | () [default] draft |
| 280 | * 8:f621d00f5f0e added d | 278 | o 8:f621d00f5f0e added d |
| 281 |/ () [foobar] draft | 279 |/ () [foobar] draft |
| 282 o 3:ca1b80f7960a added c | 280 o 3:ca1b80f7960a added c |
| 283 | () [default] draft | 281 | () [default] draft |
| 284 o 2:b1661037fa25 added b | 282 o 2:b1661037fa25 added b |
| 285 | () [default] draft | 283 | () [default] draft |