Mercurial > evolve
comparison tests/test-stabilize-order.t @ 3592:7a5c3175015e mercurial-4.2
test-compat: merge mercurial-4.3 into mercurial-4.2
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 21 Mar 2018 16:32:54 +0100 |
| parents | 98941c28f3e2 1e2f683e11e7 |
| children |
comparison
equal
deleted
inserted
replaced
| 3591:98941c28f3e2 | 3592:7a5c3175015e |
|---|---|
| 110 --- successors.old* (glob) | 110 --- successors.old* (glob) |
| 111 +++ successors.new* (glob) | 111 +++ successors.new* (glob) |
| 112 @@ -3,3 +3,4 @@ | 112 @@ -3,3 +3,4 @@ |
| 113 93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 (*) {'ef1': '*', 'user': 'test'} (glob) | 113 93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
| 114 7a7d76dc97c57751de9e80f61ed2a639bd03cd24 0 {93418d2c0979643ad446f621195e78720edb05b4} (*) {'ef1': '*', 'user': 'test'} (glob) | 114 7a7d76dc97c57751de9e80f61ed2a639bd03cd24 0 {93418d2c0979643ad446f621195e78720edb05b4} (*) {'ef1': '*', 'user': 'test'} (glob) |
| 115 22619daeed78036f80fbd326b6852519c4f0c25e 81b8bbcd5892841efed41433d7a5e9df922396cb 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 115 22619daeed78036f80fbd326b6852519c4f0c25e 81b8bbcd5892841efed41433d7a5e9df922396cb 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
| 116 +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 0f691739f91762462bf8ba21f35fdf71fe64310e 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 116 +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 0f691739f91762462bf8ba21f35fdf71fe64310e 0 (*) {'ef1': '*', 'user': 'test'} (glob) |
| 117 [1] | 117 [1] |
| 118 | 118 |
| 119 | 119 |
| 120 | 120 |
| 121 $ glog | 121 $ glog |
| 147 |/ | 147 |/ |
| 148 o 7:005fe5914f78@default(draft) adda | 148 o 7:005fe5914f78@default(draft) adda |
| 149 | | 149 | |
| 150 o 0:c471ef929e6a@default(draft) addroot | 150 o 0:c471ef929e6a@default(draft) addroot |
| 151 | 151 |
| 152 | | | |
| 153 $ hg up 9 | 152 $ hg up 9 |
| 154 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 153 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 155 $ hg evolve -v | 154 $ hg evolve -v |
| 156 nothing to evolve on current working copy parent | 155 nothing to evolve on current working copy parent |
| 157 (1 other orphan in the repository, do you want --any or --rev) | 156 (1 other orphan in the repository, do you want --any or --rev) |
| 219 | | summary: firstambiguous | 218 | | summary: firstambiguous |
| 220 | | | 219 | | |
| 221 | x changeset: 12:2256dae6521f | 220 | x changeset: 12:2256dae6521f |
| 222 |/ user: test | 221 |/ user: test |
| 223 | date: Thu Jan 01 00:00:00 1970 +0000 | 222 | date: Thu Jan 01 00:00:00 1970 +0000 |
| 224 | obsolete: reworded as f83a0bce03e4 | |
| 225 | summary: addc | 223 | summary: addc |
| 226 | | 224 | |
| 227 o changeset: 11:7a68bc4596ea | 225 o changeset: 11:7a68bc4596ea |
| 228 | parent: 7:005fe5914f78 | 226 | parent: 7:005fe5914f78 |
| 229 | user: test | 227 | user: test |