Mercurial > evolve
comparison tests/test-split.t @ 3103:13cafb250c1a mercurial-4.3
test-compat: revert ouput related to operation
This effectively backs out 4b951a9a6895.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 20 Oct 2017 16:07:06 +0200 |
| parents | f43a310c4338 |
| children | f5d472b7e800 |
comparison
equal
deleted
inserted
replaced
| 3102:6604d96fc73c | 3103:13cafb250c1a |
|---|---|
| 37 $ mkcommit _c --user other-test-user | 37 $ mkcommit _c --user other-test-user |
| 38 $ mkcommit _d | 38 $ mkcommit _d |
| 39 $ echo "change to a" >> _a | 39 $ echo "change to a" >> _a |
| 40 $ hg amend | 40 $ hg amend |
| 41 $ hg debugobsolete | 41 $ hg debugobsolete |
| 42 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} | 42 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (*) {'ef1': '8', 'user': 'test'} (glob) |
| 43 | 43 |
| 44 To create commits with the number of split | 44 To create commits with the number of split |
| 45 $ echo 0 > num | 45 $ echo 0 > num |
| 46 $ cat > editor.sh << '__EOF__' | 46 $ cat > editor.sh << '__EOF__' |
| 47 > NUM=$(cat num) | 47 > NUM=$(cat num) |
| 89 record this change to '_d'? [Ynesfdaq?] y | 89 record this change to '_d'? [Ynesfdaq?] y |
| 90 | 90 |
| 91 no more change to split | 91 no more change to split |
| 92 | 92 |
| 93 $ hg debugobsolete | 93 $ hg debugobsolete |
| 94 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} | 94 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (*) {'ef1': '8', 'user': 'test'} (glob) |
| 95 d2fe56e71366c2c5376c89960c281395062c0619 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b 033b3f5ae73db67c10de938fb6f26b949aaef172 0 (*) {'ef1': '13', 'user': 'test'} (glob) | 95 d2fe56e71366c2c5376c89960c281395062c0619 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b 033b3f5ae73db67c10de938fb6f26b949aaef172 0 (*) {'ef1': '13', 'user': 'test'} (glob) |
| 96 $ hg log -G | 96 $ hg log -G |
| 97 @ changeset: 6:033b3f5ae73d | 97 @ changeset: 6:033b3f5ae73d |
| 98 | tag: tip | 98 | tag: tip |
| 99 | user: test | 99 | user: test |
| 206 | 206 |
| 207 Stop before splitting the commit completely creates a commit with all the | 207 Stop before splitting the commit completely creates a commit with all the |
| 208 remaining changes | 208 remaining changes |
| 209 | 209 |
| 210 $ hg debugobsolete | 210 $ hg debugobsolete |
| 211 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} | 211 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (*) {'ef1': '8', 'user': 'test'} (glob) |
| 212 d2fe56e71366c2c5376c89960c281395062c0619 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b 033b3f5ae73db67c10de938fb6f26b949aaef172 0 (*) {'ef1': '13', 'user': 'test'} (glob) | 212 d2fe56e71366c2c5376c89960c281395062c0619 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b 033b3f5ae73db67c10de938fb6f26b949aaef172 0 (*) {'ef1': '13', 'user': 'test'} (glob) |
| 213 52149352b372d39b19127d5bd2d488b1b63f9f85 b434287e665ce757ee5463a965cb3d119ca9e893 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} | 213 52149352b372d39b19127d5bd2d488b1b63f9f85 b434287e665ce757ee5463a965cb3d119ca9e893 0 (*) {'ef1': '9', 'user': 'test'} (glob) |
| 214 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b e2b4afde39803bd42bb1374b230fca1b1e8cc868 0 (*) {'ef1': '4', 'user': 'test'} (glob) | 214 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b e2b4afde39803bd42bb1374b230fca1b1e8cc868 0 (*) {'ef1': '4', 'user': 'test'} (glob) |
| 215 033b3f5ae73db67c10de938fb6f26b949aaef172 bb5e4f6020c74e7961a51fda635ea9df9b04dda8 0 (*) {'ef1': '4', 'user': 'test'} (glob) | 215 033b3f5ae73db67c10de938fb6f26b949aaef172 bb5e4f6020c74e7961a51fda635ea9df9b04dda8 0 (*) {'ef1': '4', 'user': 'test'} (glob) |
| 216 b434287e665ce757ee5463a965cb3d119ca9e893 ead2066d1dbf14833fe1069df1b735e4e9468c40 1188c4216eba37f18a1de6558564601d00ff2143 0 (*) {'ef1': '13', 'user': 'test'} (glob) | 216 b434287e665ce757ee5463a965cb3d119ca9e893 ead2066d1dbf14833fe1069df1b735e4e9468c40 1188c4216eba37f18a1de6558564601d00ff2143 0 (*) {'ef1': '13', 'user': 'test'} (glob) |
| 217 $ hg evolve --all | 217 $ hg evolve --all |
| 218 move:[8] split1 | 218 move:[8] split1 |