Mercurial > evolve
comparison tests/test-topic-tutorial.t @ 3013:945a0989e41b
packaging: merge stable back into default
6.7.0 has been released.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 27 Sep 2017 16:26:30 +0200 |
| parents | bd7e8be29542 |
| children | d12c82fd1143 |
comparison
equal
deleted
inserted
replaced
| 3012:081070828703 | 3013:945a0989e41b |
|---|---|
| 1180 t2: Adding saw | 1180 t2: Adding saw |
| 1181 t1@ Adding hammer (current) | 1181 t1@ Adding hammer (current) |
| 1182 t0^ add a pair of shoes (base) | 1182 t0^ add a pair of shoes (base) |
| 1183 | 1183 |
| 1184 $ hg amend -m "Adding hammer to the shopping list" | 1184 $ hg amend -m "Adding hammer to the shopping list" |
| 1185 2 new unstable changesets | 1185 2 new orphan changesets |
| 1186 | 1186 |
| 1187 Understanding the current situation with hg log is not so easy, because | 1187 Understanding the current situation with hg log is not so easy, because |
| 1188 it shows too many things: | 1188 it shows too many things: |
| 1189 | 1189 |
| 1190 $ hg log -G -r "t0::" | 1190 $ hg log -G -r "t0::" |
| 1209 | | 1209 | |
| 1210 | o changeset: 15:bb1e6254f532 | 1210 | o changeset: 15:bb1e6254f532 |
| 1211 | | topic: tools | 1211 | | topic: tools |
| 1212 | | user: test | 1212 | | user: test |
| 1213 | | date: Thu Jan 01 00:00:00 1970 +0000 | 1213 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 1214 | | trouble: unstable | 1214 | | instability: orphan |
| 1215 | | summary: Adding drill | 1215 | | summary: Adding drill |
| 1216 | | | 1216 | | |
| 1217 | o changeset: 14:d4f97f32f8a1 | 1217 | o changeset: 14:d4f97f32f8a1 |
| 1218 | | topic: tools | 1218 | | topic: tools |
| 1219 | | user: test | 1219 | | user: test |
| 1220 | | date: Thu Jan 01 00:00:00 1970 +0000 | 1220 | | date: Thu Jan 01 00:00:00 1970 +0000 |
| 1221 | | trouble: unstable | 1221 | | instability: orphan |
| 1222 | | summary: Adding saw | 1222 | | summary: Adding saw |
| 1223 | | | 1223 | | |
| 1224 | x changeset: 13:a8ab3599d53d | 1224 | x changeset: 13:a8ab3599d53d |
| 1225 |/ topic: tools | 1225 |/ topic: tools |
| 1226 | user: test | 1226 | user: test |