Mercurial > evolve
comparison tests/test-evolve-issue5832.t @ 3714:19ec729f3ca2 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 23 Apr 2018 12:11:10 +0200 |
| parents | b36e38e3a176 |
| children | e5ba6531503e d00f0c369bc7 |
comparison
equal
deleted
inserted
replaced
| 3713:4358f29af833 | 3714:19ec729f3ca2 |
|---|---|
| 67 | () draft | 67 | () draft |
| 68 | o 6:62fb70414f99 added c | 68 | o 6:62fb70414f99 added c |
| 69 |/ () draft | 69 |/ () draft |
| 70 | o 5:7014ec2829cd added a | 70 | o 5:7014ec2829cd added a |
| 71 |/ () draft | 71 |/ () draft |
| 72 | * 4:b9b387427a53 merge commit | 72 | o 4:b9b387427a53 merge commit |
| 73 | |\ () draft | 73 | |\ () draft |
| 74 +---o 3:9402371b436e added c and d | 74 +---o 3:9402371b436e added c and d |
| 75 | | () draft | 75 | | () draft |
| 76 | * 2:a1da0651488c added b | 76 | o 2:a1da0651488c added b |
| 77 | | () draft | 77 | | () draft |
| 78 | x 1:1b24879c5c3c added a | 78 | x 1:1b24879c5c3c added a |
| 79 |/ () draft | 79 |/ () draft |
| 80 o 0:bde1d2b6b5e5 added base | 80 o 0:bde1d2b6b5e5 added base |
| 81 () draft | 81 () draft |
| 88 | () draft | 88 | () draft |
| 89 | o 6:62fb70414f99 added c | 89 | o 6:62fb70414f99 added c |
| 90 |/ () draft | 90 |/ () draft |
| 91 | o 5:7014ec2829cd added a | 91 | o 5:7014ec2829cd added a |
| 92 |/ () draft | 92 |/ () draft |
| 93 | * 4:b9b387427a53 merge commit | 93 | o 4:b9b387427a53 merge commit |
| 94 | |\ () draft | 94 | |\ () draft |
| 95 +---x 3:9402371b436e added c and d | 95 +---x 3:9402371b436e added c and d |
| 96 | | () draft | 96 | | () draft |
| 97 | * 2:a1da0651488c added b | 97 | o 2:a1da0651488c added b |
| 98 | | () draft | 98 | | () draft |
| 99 | x 1:1b24879c5c3c added a | 99 | x 1:1b24879c5c3c added a |
| 100 |/ () draft | 100 |/ () draft |
| 101 o 0:bde1d2b6b5e5 added base | 101 o 0:bde1d2b6b5e5 added base |
| 102 () draft | 102 () draft |
| 185 0 files updated, 0 files merged, 4 files removed, 0 files unresolved | 185 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
| 186 $ echo l > l | 186 $ echo l > l |
| 187 $ hg ci -Aqm "added l" | 187 $ hg ci -Aqm "added l" |
| 188 $ hg grab -r 1b24879c5c3c | 188 $ hg grab -r 1b24879c5c3c |
| 189 grabbing 1:1b24879c5c3c "added a" | 189 grabbing 1:1b24879c5c3c "added a" |
| 190 2 new orphan changesets | |
| 191 | 190 |
| 192 $ hg up bde1d2b6b5e5 | 191 $ hg up bde1d2b6b5e5 |
| 193 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 192 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 194 $ echo c > c | 193 $ echo c > c |
| 195 $ hg ci -Aqm "added c" | 194 $ hg ci -Aqm "added c" |
| 205 |/ () draft | 204 |/ () draft |
| 206 | o 6:5568b87b1491 added a | 205 | o 6:5568b87b1491 added a |
| 207 | | () draft | 206 | | () draft |
| 208 | o 5:0a6281e212fe added l | 207 | o 5:0a6281e212fe added l |
| 209 |/ () draft | 208 |/ () draft |
| 210 | * 4:b9b387427a53 merge commit | 209 | o 4:b9b387427a53 merge commit |
| 211 | |\ () draft | 210 | |\ () draft |
| 212 +---o 3:9402371b436e added c and d | 211 +---o 3:9402371b436e added c and d |
| 213 | | () draft | 212 | | () draft |
| 214 | * 2:a1da0651488c added b | 213 | o 2:a1da0651488c added b |
| 215 | | () draft | 214 | | () draft |
| 216 | x 1:1b24879c5c3c added a | 215 | x 1:1b24879c5c3c added a |
| 217 |/ () draft | 216 |/ () draft |
| 218 o 0:bde1d2b6b5e5 added base | 217 o 0:bde1d2b6b5e5 added base |
| 219 () draft | 218 () draft |
| 228 |/ () draft | 227 |/ () draft |
| 229 | o 6:5568b87b1491 added a | 228 | o 6:5568b87b1491 added a |
| 230 | | () draft | 229 | | () draft |
| 231 | o 5:0a6281e212fe added l | 230 | o 5:0a6281e212fe added l |
| 232 |/ () draft | 231 |/ () draft |
| 233 | * 4:b9b387427a53 merge commit | 232 | o 4:b9b387427a53 merge commit |
| 234 | |\ () draft | 233 | |\ () draft |
| 235 +---x 3:9402371b436e added c and d | 234 +---x 3:9402371b436e added c and d |
| 236 | | () draft | 235 | | () draft |
| 237 | * 2:a1da0651488c added b | 236 | o 2:a1da0651488c added b |
| 238 | | () draft | 237 | | () draft |
| 239 | x 1:1b24879c5c3c added a | 238 | x 1:1b24879c5c3c added a |
| 240 |/ () draft | 239 |/ () draft |
| 241 o 0:bde1d2b6b5e5 added base | 240 o 0:bde1d2b6b5e5 added base |
| 242 () draft | 241 () draft |