Mercurial > evolve
comparison tests/test-fixup.t @ 6211:6faab8daf02a stable
fixup: work correctly with bookmarks
Initializing bookmarkchanges to an empty list is required when finalizing
relocation of a node that has one or more bookmarks. Other commands that use
evolvecmd._relocate() already do this.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Wed, 06 Apr 2022 15:57:54 +0300 |
| parents | d2ec9ab1694e |
| children | 4298ae0b966d |
comparison
equal
deleted
inserted
replaced
| 6210:6ae0077e416e | 6211:6faab8daf02a |
|---|---|
| 54 $ mkcommit baz | 54 $ mkcommit baz |
| 55 | 55 |
| 56 amending the middle of the stack | 56 amending the middle of the stack |
| 57 -------------------------------- | 57 -------------------------------- |
| 58 | 58 |
| 59 $ hg bookmark bm | |
| 59 $ echo 'hookah bar' > bar | 60 $ echo 'hookah bar' > bar |
| 60 $ hg fixup -r 'desc(bar)' | 61 $ hg fixup -r 'desc(bar)' |
| 62 (leaving bookmark bm) | |
| 61 1 new orphan changesets | 63 1 new orphan changesets |
| 62 | 64 |
| 63 $ hg diff -c tip | 65 $ hg diff -c tip |
| 64 diff --git a/bar b/bar | 66 diff --git a/bar b/bar |
| 65 new file mode 100644 | 67 new file mode 100644 |
| 68 @@ -0,0 +1,1 @@ | 70 @@ -0,0 +1,1 @@ |
| 69 +hookah bar | 71 +hookah bar |
| 70 | 72 |
| 71 $ hg glog | 73 $ hg glog |
| 72 o 5:2eec5320cfc7 bar | 74 o 5:2eec5320cfc7 bar |
| 73 | () draft | 75 | (bm) draft |
| 74 | @ 3:fd2f632e47ab temporary fixup commit | 76 | @ 3:fd2f632e47ab temporary fixup commit |
| 75 | | () draft | 77 | | () draft |
| 76 | * 2:a425495a8e64 baz | 78 | * 2:a425495a8e64 baz |
| 77 | | () draft orphan | 79 | | () draft orphan |
| 78 | x 1:c0c7cf58edc5 bar | 80 | x 1:c0c7cf58edc5 bar |
| 80 o 0:e63c23eaa88a foo | 82 o 0:e63c23eaa88a foo |
| 81 () draft | 83 () draft |
| 82 | 84 |
| 83 $ hg glog --hidden | 85 $ hg glog --hidden |
| 84 o 5:2eec5320cfc7 bar | 86 o 5:2eec5320cfc7 bar |
| 85 | () draft | 87 | (bm) draft |
| 86 | x 4:4869c1db2884 temporary fixup commit | 88 | x 4:4869c1db2884 temporary fixup commit |
| 87 | | () draft | 89 | | () draft |
| 88 | | @ 3:fd2f632e47ab temporary fixup commit | 90 | | @ 3:fd2f632e47ab temporary fixup commit |
| 89 | | | () draft | 91 | | | () draft |
| 90 | | * 2:a425495a8e64 baz | 92 | | * 2:a425495a8e64 baz |
| 105 | 107 |
| 106 $ hg glog | 108 $ hg glog |
| 107 o 6:eb1755d9f810 baz | 109 o 6:eb1755d9f810 baz |
| 108 | () draft | 110 | () draft |
| 109 @ 5:2eec5320cfc7 bar | 111 @ 5:2eec5320cfc7 bar |
| 110 | () draft | 112 | (bm) draft |
| 111 o 0:e63c23eaa88a foo | 113 o 0:e63c23eaa88a foo |
| 112 () draft | 114 () draft |
| 113 | 115 |
| 114 amending working directory parent in secret phase | 116 amending working directory parent in secret phase |
| 115 ------------------------------------------------- | 117 ------------------------------------------------- |
| 126 working directory is now at 12b5e442244f | 128 working directory is now at 12b5e442244f |
| 127 $ hg glog | 129 $ hg glog |
| 128 @ 9:12b5e442244f baz | 130 @ 9:12b5e442244f baz |
| 129 | () secret | 131 | () secret |
| 130 o 5:2eec5320cfc7 bar | 132 o 5:2eec5320cfc7 bar |
| 131 | () draft | 133 | (bm) draft |
| 132 o 0:e63c23eaa88a foo | 134 o 0:e63c23eaa88a foo |
| 133 () draft | 135 () draft |
| 134 | 136 |
| 135 testing --abort/--continue | 137 testing --abort/--continue |
| 136 -------------------------- | 138 -------------------------- |
| 147 o 10:c90c517f86b3 update foo | 149 o 10:c90c517f86b3 update foo |
| 148 | () draft | 150 | () draft |
| 149 | @ 9:12b5e442244f baz | 151 | @ 9:12b5e442244f baz |
| 150 | | () secret | 152 | | () secret |
| 151 | o 5:2eec5320cfc7 bar | 153 | o 5:2eec5320cfc7 bar |
| 152 |/ () draft | 154 |/ (bm) draft |
| 153 o 0:e63c23eaa88a foo | 155 o 0:e63c23eaa88a foo |
| 154 () draft | 156 () draft |
| 155 | 157 |
| 156 testing --abort flag | 158 testing --abort flag |
| 157 | 159 |
| 247 | @ 11:1c9958e73c2d temporary fixup commit | 249 | @ 11:1c9958e73c2d temporary fixup commit |
| 248 | | () secret | 250 | | () secret |
| 249 | o 9:12b5e442244f baz | 251 | o 9:12b5e442244f baz |
| 250 | | () secret | 252 | | () secret |
| 251 | o 5:2eec5320cfc7 bar | 253 | o 5:2eec5320cfc7 bar |
| 252 |/ () draft | 254 |/ (bm) draft |
| 253 o 0:e63c23eaa88a foo | 255 o 0:e63c23eaa88a foo |
| 254 () draft | 256 () draft |
| 255 | 257 |
| 256 $ hg evolve | 258 $ hg evolve |
| 257 update:[13] update foo | 259 update:[13] update foo |
| 271 | @ 14:4a9c4d14d447 temporary fixup commit | 273 | @ 14:4a9c4d14d447 temporary fixup commit |
| 272 | | () draft | 274 | | () draft |
| 273 | | o 13:fed7e534b3bb update foo | 275 | | o 13:fed7e534b3bb update foo |
| 274 | |/ () draft | 276 | |/ () draft |
| 275 o | 5:2eec5320cfc7 bar | 277 o | 5:2eec5320cfc7 bar |
| 276 |/ () draft | 278 |/ (bm) draft |
| 277 o 0:e63c23eaa88a foo | 279 o 0:e63c23eaa88a foo |
| 278 () draft | 280 () draft |
| 279 | 281 |
| 280 $ hg evolve | 282 $ hg evolve |
| 281 update:[16] baz | 283 update:[16] baz |
| 286 @ 16:b50fd0850076 baz | 288 @ 16:b50fd0850076 baz |
| 287 | () secret | 289 | () secret |
| 288 | o 13:fed7e534b3bb update foo | 290 | o 13:fed7e534b3bb update foo |
| 289 | | () draft | 291 | | () draft |
| 290 o | 5:2eec5320cfc7 bar | 292 o | 5:2eec5320cfc7 bar |
| 291 |/ () draft | 293 |/ (bm) draft |
| 292 o 0:e63c23eaa88a foo | 294 o 0:e63c23eaa88a foo |
| 293 () draft | 295 () draft |
| 294 $ hg diff -c . | 296 $ hg diff -c . |
| 295 diff --git a/baz b/baz | 297 diff --git a/baz b/baz |
| 296 new file mode 100644 | 298 new file mode 100644 |