Mercurial > hg
comparison tests/test-rebase-rename.t @ 28627:d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Leaving regular parent edges set to |, grandparent edges set to : and missing
parent edges set to end early. A sample graph:
o changeset: 32:d06dffa21a31
|\ parent: 27:886ed638191b
| : parent: 31:621d83e11f67
| :
o : changeset: 31:621d83e11f67
|\: parent: 21:d42a756af44d
| : parent: 30:6e11cd4b648f
| :
o : changeset: 30:6e11cd4b648f
|\ \ parent: 28:44ecd0b9ae99
| ~ : parent: 29:cd9bb2be7593
| /
o : changeset: 28:44ecd0b9ae99
|\ \ parent: 1:6db2ef61d156
| ~ : parent: 26:7f25b6c2f0b9
| /
o : changeset: 26:7f25b6c2f0b9
|\ \ parent: 18:1aa84d96232a
| | : parent: 25:91da8ed57247
| | :
| o : changeset: 25:91da8ed57247
| |\: parent: 21:d42a756af44d
| | : parent: 24:a9c19a3d96b7
| | :
| o : changeset: 24:a9c19a3d96b7
| |\ \ parent: 0:e6eb3150255d
| | ~ : parent: 23:a01cddf0766d
| | /
| o : changeset: 23:a01cddf0766d
| |\ \ parent: 1:6db2ef61d156
| | ~ : parent: 22:e0d9cccacb5d
| | /
| o : changeset: 22:e0d9cccacb5d
|/:/ parent: 18:1aa84d96232a
| : parent: 21:d42a756af44d
| :
| o changeset: 21:d42a756af44d
| |\ parent: 19:31ddc2c1573b
| | | parent: 20:d30ed6450e32
| | |
+---o changeset: 20:d30ed6450e32
| | | parent: 0:e6eb3150255d
| | ~ parent: 18:1aa84d96232a
| |
| o changeset: 19:31ddc2c1573b
| |\ parent: 15:1dda3f72782d
| ~ ~ parent: 17:44765d7c06e0
|
o changeset: 18:1aa84d96232a
parent: 1:6db2ef61d156
parent: 15:1dda3f72782d
author | Martijn Pieters <mjpieters@fb.com> |
---|---|
date | Wed, 23 Mar 2016 13:34:47 -0700 |
parents | d1561a422748 |
children | 3b7cb3d17137 |
comparison
equal
deleted
inserted
replaced
28626:60ee2593a270 | 28627:d7af9b4ae7dd |
---|---|
296 @ 4: 'File d created as copy of c and modified' | 296 @ 4: 'File d created as copy of c and modified' |
297 | | 297 | |
298 o 3: 'File c created as copy of b and modified' | 298 o 3: 'File c created as copy of b and modified' |
299 | | 299 | |
300 o 2: 'File b created as copy of a and modified' | 300 o 2: 'File b created as copy of a and modified' |
301 | | 301 : |
302 o 0: 'File a created' | 302 o 0: 'File a created' |
303 | 303 |
304 Same steps as above, but with --collapse on rebase to make sure the | 304 Same steps as above, but with --collapse on rebase to make sure the |
305 copy records collapse correctly. | 305 copy records collapse correctly. |
306 $ hg co 1 | 306 $ hg co 1 |
321 This should show both revision 3 and 0 since 'd' was transitively a | 321 This should show both revision 3 and 0 since 'd' was transitively a |
322 copy of 'a'. | 322 copy of 'a'. |
323 | 323 |
324 $ hg tglog --follow d | 324 $ hg tglog --follow d |
325 @ 3: 'Collapsed revision | 325 @ 3: 'Collapsed revision |
326 | * File b created as copy of a and modified | 326 : * File b created as copy of a and modified |
327 | * File c created as copy of b and modified | 327 : * File c created as copy of b and modified |
328 | * File d created as copy of c and modified' | 328 : * File d created as copy of c and modified' |
329 o 0: 'File a created' | 329 o 0: 'File a created' |
330 | 330 |
331 | 331 |
332 $ cd .. | 332 $ cd .. |