Mercurial > evolve
comparison tests/test-stabilize-conflict.t @ 3106:a867d59ea97a mercurial-4.3
test-compat: revert output changes from phase renaming
We keep using the old name for the older version. test has to reflect that.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 20 Oct 2017 20:04:13 +0200 |
| parents | f5d472b7e800 |
| children | 9c9c8c1eeb93 9f900937c198 |
comparison
equal
deleted
inserted
replaced
| 3105:f5d472b7e800 | 3106:a867d59ea97a |
|---|---|
| 74 -huit | 74 -huit |
| 75 +eight | 75 +eight |
| 76 neuf | 76 neuf |
| 77 dix | 77 dix |
| 78 $ hg amend | 78 $ hg amend |
| 79 1 new orphan changesets | 79 1 new unstable changesets |
| 80 $ hg evolve | 80 $ hg evolve |
| 81 move:[2] babar count up to fifteen | 81 move:[2] babar count up to fifteen |
| 82 atop:[4] babar count up to ten | 82 atop:[4] babar count up to ten |
| 83 merging babar | 83 merging babar |
| 84 working directory is now at 71c18f70c34f | 84 working directory is now at 71c18f70c34f |
| 112 [4] babar count up to ten | 112 [4] babar count up to ten |
| 113 $ safesed 's/dix/ten/' babar | 113 $ safesed 's/dix/ten/' babar |
| 114 $ hg diff | 114 $ hg diff |
| 115 diff -r 5977072d13c5 babar | 115 diff -r 5977072d13c5 babar |
| 116 --- a/babar Thu Jan 01 00:00:00 1970 +0000 | 116 --- a/babar Thu Jan 01 00:00:00 1970 +0000 |
| 117 +++ b/babar Thu Jan 01 00:00:00 1970 +0000 | 117 +++ b/babar * (glob) |
| 118 @@ -7,4 +7,4 @@ | 118 @@ -7,4 +7,4 @@ |
| 119 sept | 119 sept |
| 120 eight | 120 eight |
| 121 neuf | 121 neuf |
| 122 -dix | 122 -dix |
| 123 +ten | 123 +ten |
| 124 $ hg amend | 124 $ hg amend |
| 125 1 new orphan changesets | 125 1 new unstable changesets |
| 126 $ hg evolve | 126 $ hg evolve |
| 127 move:[5] babar count up to fifteen | 127 move:[5] babar count up to fifteen |
| 128 atop:[7] babar count up to ten | 128 atop:[7] babar count up to ten |
| 129 merging babar | 129 merging babar |
| 130 warning: conflicts while merging babar! (edit, then use 'hg resolve --mark') | 130 warning: conflicts while merging babar! (edit, then use 'hg resolve --mark') |
| 143 | summary: babar count up to ten | 143 | summary: babar count up to ten |
| 144 | | 144 | |
| 145 | o changeset: 5:71c18f70c34f | 145 | o changeset: 5:71c18f70c34f |
| 146 | | user: test | 146 | | user: test |
| 147 | | date: Thu Jan 01 00:00:00 1970 +0000 | 147 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 148 | | instability: orphan | 148 | | trouble: unstable |
| 149 | | summary: babar count up to fifteen | 149 | | summary: babar count up to fifteen |
| 150 | | | 150 | | |
| 151 | x changeset: 4:5977072d13c5 | 151 | x changeset: 4:5977072d13c5 |
| 152 |/ parent: 0:29ec1554cfaf | 152 |/ parent: 0:29ec1554cfaf |
| 153 | user: test | 153 | user: test |
| 207 eight | 207 eight |
| 208 neuf | 208 neuf |
| 209 -ten | 209 -ten |
| 210 +zehn | 210 +zehn |
| 211 $ hg amend | 211 $ hg amend |
| 212 1 new orphan changesets | 212 1 new unstable changesets |
| 213 $ safesed 's/interactive=.*/interactive=true/' $HGRCPATH | 213 $ safesed 's/interactive=.*/interactive=true/' $HGRCPATH |
| 214 $ hg evolve --tool touch <<EOF | 214 $ hg evolve --tool touch <<EOF |
| 215 > n | 215 > n |
| 216 > EOF | 216 > EOF |
| 217 move:[8] babar count up to fifteen | 217 move:[8] babar count up to fifteen |
| 235 | summary: babar count up to ten | 235 | summary: babar count up to ten |
| 236 | | 236 | |
| 237 | o changeset: 8:1836b91c6c1d | 237 | o changeset: 8:1836b91c6c1d |
| 238 | | user: test | 238 | | user: test |
| 239 | | date: Thu Jan 01 00:00:00 1970 +0000 | 239 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 240 | | instability: orphan | 240 | | trouble: unstable |
| 241 | | summary: babar count up to fifteen | 241 | | summary: babar count up to fifteen |
| 242 | | | 242 | | |
| 243 | x changeset: 7:e04690b09bc6 | 243 | x changeset: 7:e04690b09bc6 |
| 244 |/ parent: 0:29ec1554cfaf | 244 |/ parent: 0:29ec1554cfaf |
| 245 | user: test | 245 | user: test |