Mercurial > evolve
comparison tests/test-evolve-content-divergent-interrupted.t @ 5304:83ceafbaa7d6 stable
branching: merge into stable in preparation for release
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 08 May 2020 18:22:26 +0800 |
| parents | e8660b28bfee |
| children | 88f9bbba392d d7d954b6d518 |
comparison
equal
deleted
inserted
replaced
| 5252:a828c7a7ace1 | 5304:83ceafbaa7d6 |
|---|---|
| 195 base: [3] added c | 195 base: [3] added c |
| 196 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 196 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 197 merge:[5] added d | 197 merge:[5] added d |
| 198 with: [7] added d | 198 with: [7] added d |
| 199 base: [4] added d | 199 base: [4] added d |
| 200 rebasing "divergent" content-divergent changeset e49523854bc8 on ddcf04e1458c | 200 rebasing "divergent" content-divergent changeset e49523854bc8 on 4566502c0483 |
| 201 merging d | 201 merging d |
| 202 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 202 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 203 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 203 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 204 unresolved merge conflicts | 204 unresolved merge conflicts |
| 205 (see 'hg help evolve.interrupted') | 205 (see 'hg help evolve.interrupted') |
| 235 o 0:8fa14d15e168 added hgignore | 235 o 0:8fa14d15e168 added hgignore |
| 236 () draft | 236 () draft |
| 237 | 237 |
| 238 $ hg obslog -r . --all | 238 $ hg obslog -r . --all |
| 239 * 2ba73e31f264 (8) added c | 239 * 2ba73e31f264 (8) added c |
| 240 | amended(content) from ca1b80f7960a using amend by test (Thu Jan 01 00:00:00 1970 +0000) | |
| 240 | | 241 | |
| 241 | @ 491e10505bae (10) added c | 242 | @ 491e10505bae (10) added c |
| 243 | | amended(content) from 7398f702a162 using amend by test (Thu Jan 01 00:00:00 1970 +0000) | |
| 242 | | | 244 | | |
| 243 | x 7398f702a162 (9) added c | 245 | x 7398f702a162 (9) added c |
| 244 |/ amended(content) as 491e10505bae using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 246 |/ amended(content) from ca1b80f7960a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
| 245 | | 247 | |
| 246 x ca1b80f7960a (3) added c | 248 x ca1b80f7960a (3) added c |
| 247 amended(content) as 2ba73e31f264 using amend by test (Thu Jan 01 00:00:00 1970 +0000) | |
| 248 amended(content) as 7398f702a162 using amend by test (Thu Jan 01 00:00:00 1970 +0000) | |
| 249 | 249 |
| 250 $ cd .. | 250 $ cd .. |
| 251 | 251 |
| 252 Creating content-divergence on multiple parents when gca of divergent changesets | 252 Creating content-divergence on multiple parents when gca of divergent changesets |
| 253 is parent of one of the divergents and relocating leads to conflicts | 253 is parent of one of the divergents and relocating leads to conflicts |