| pulkit |
| hg-reviewers |
This also makes the test cases more consistent since a few had missed
the ":" in "changeset:" that the others used.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | tests/test-copytrace-heuristics.t (81 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| Martin von Zweigbergk | Apr 19 2019, 1:08 AM |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| > } | > } | ||||
| > __EOF__ | > __EOF__ | ||||
| $ . "$TESTTMP/copytrace.sh" | $ . "$TESTTMP/copytrace.sh" | ||||
| $ cat >> $HGRCPATH << EOF | $ cat >> $HGRCPATH << EOF | ||||
| > [extensions] | > [extensions] | ||||
| > rebase= | > rebase= | ||||
| > shelve= | > shelve= | ||||
| > [alias] | |||||
| > l = log -G -T 'changeset: {node}\n desc: {desc}\n' | |||||
| > pl = log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n' | |||||
| > EOF | > EOF | ||||
| NOTE: calling initclient() set copytrace.sourcecommitlimit=-1 as we want to | NOTE: calling initclient() set copytrace.sourcecommitlimit=-1 as we want to | ||||
| prevent the full copytrace algorithm to run and test the heuristic algorithm | prevent the full copytrace algorithm to run and test the heuristic algorithm | ||||
| without complexing the test cases with public and draft commits. | without complexing the test cases with public and draft commits. | ||||
| Check filename heuristics (same dirname and same basename) | Check filename heuristics (same dirname and same basename) | ||||
| ---------------------------------------------------------- | ---------------------------------------------------------- | ||||
| $ hg mv a b | $ hg mv a b | ||||
| $ hg mv -q dir dir2 | $ hg mv -q dir dir2 | ||||
| $ hg ci -m 'mv a b, mv dir/ dir2/' | $ hg ci -m 'mv a b, mv dir/ dir2/' | ||||
| $ hg up -q 0 | $ hg up -q 0 | ||||
| $ echo b > a | $ echo b > a | ||||
| $ echo b > dir/file.txt | $ echo b > dir/file.txt | ||||
| $ hg ci -qm 'mod a, mod dir/file.txt' | $ hg ci -qm 'mod a, mod dir/file.txt' | ||||
| $ hg log -G -T 'changeset: {node}\n desc: {desc}\n' | $ hg l | ||||
| @ changeset: 557f403c0afd2a3cf15d7e2fb1f1001a8b85e081 | @ changeset: 557f403c0afd2a3cf15d7e2fb1f1001a8b85e081 | ||||
| | desc: mod a, mod dir/file.txt | | desc: mod a, mod dir/file.txt | ||||
| | o changeset: 928d74bc9110681920854d845c06959f6dfc9547 | | o changeset: 928d74bc9110681920854d845c06959f6dfc9547 | ||||
| |/ desc: mv a b, mv dir/ dir2/ | |/ desc: mv a b, mv dir/ dir2/ | ||||
| o changeset: 3c482b16e54596fed340d05ffaf155f156cda7ee | o changeset: 3c482b16e54596fed340d05ffaf155f156cda7ee | ||||
| desc: initial | desc: initial | ||||
| $ hg rebase -s . -d 1 | $ hg rebase -s . -d 1 | ||||
| $ hg rm a | $ hg rm a | ||||
| $ echo 'completelydifferentcontext' > b | $ echo 'completelydifferentcontext' > b | ||||
| $ hg add b | $ hg add b | ||||
| $ hg ci -m 'rm a, add b' | $ hg ci -m 'rm a, add b' | ||||
| $ hg up -q 0 | $ hg up -q 0 | ||||
| $ printf 'somecontent\nmoarcontent' > a | $ printf 'somecontent\nmoarcontent' > a | ||||
| $ hg ci -qm 'mode a' | $ hg ci -qm 'mode a' | ||||
| $ hg log -G -T 'changeset: {node}\n desc: {desc}\n' | $ hg l | ||||
| @ changeset: d526312210b9e8f795d576a77dc643796384d86e | @ changeset: d526312210b9e8f795d576a77dc643796384d86e | ||||
| | desc: mode a | | desc: mode a | ||||
| | o changeset: 46985f76c7e5e5123433527f5c8526806145650b | | o changeset: 46985f76c7e5e5123433527f5c8526806145650b | ||||
| |/ desc: rm a, add b | |/ desc: rm a, add b | ||||
| o changeset: e5b71fb099c29d9172ef4a23485aaffd497e4cc0 | o changeset: e5b71fb099c29d9172ef4a23485aaffd497e4cc0 | ||||
| desc: initial | desc: initial | ||||
| $ hg rebase -s . -d 1 | $ hg rebase -s . -d 1 | ||||
| $ hg add c | $ hg add c | ||||
| $ hg ci -m randomcommit | $ hg ci -m randomcommit | ||||
| $ hg mv a b | $ hg mv a b | ||||
| $ hg ci -m 'mv a b' | $ hg ci -m 'mv a b' | ||||
| $ hg up -q 1 | $ hg up -q 1 | ||||
| $ echo b > a | $ echo b > a | ||||
| $ hg ci -qm 'mod a' | $ hg ci -qm 'mod a' | ||||
| $ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n' | $ hg pl | ||||
| @ changeset: 9d5cf99c3d9f8e8b05ba55421f7f56530cfcf3bc | @ changeset: 9d5cf99c3d9f8e8b05ba55421f7f56530cfcf3bc | ||||
| | desc: mod a, phase: draft | | desc: mod a, phase: draft | ||||
| | o changeset: d760186dd240fc47b91eb9f0b58b0002aaeef95d | | o changeset: d760186dd240fc47b91eb9f0b58b0002aaeef95d | ||||
| |/ desc: mv a b, phase: draft | |/ desc: mv a b, phase: draft | ||||
| o changeset: 48e1b6ba639d5d7fb313fa7989eebabf99c9eb83 | o changeset: 48e1b6ba639d5d7fb313fa7989eebabf99c9eb83 | ||||
| | desc: randomcommit, phase: draft | | desc: randomcommit, phase: draft | ||||
| o changeset: e5b71fb099c29d9172ef4a23485aaffd497e4cc0 | o changeset: e5b71fb099c29d9172ef4a23485aaffd497e4cc0 | ||||
| desc: initial, phase: draft | desc: initial, phase: draft | ||||
| $ hg add c | $ hg add c | ||||
| $ hg ci -m randomcommit | $ hg ci -m randomcommit | ||||
| $ hg mv a b | $ hg mv a b | ||||
| $ hg ci -m 'mv a b' | $ hg ci -m 'mv a b' | ||||
| $ hg up -q 2 | $ hg up -q 2 | ||||
| $ echo b > b | $ echo b > b | ||||
| $ hg ci -qm 'mod b' | $ hg ci -qm 'mod b' | ||||
| $ hg log -G -T 'changeset: {node}\n desc: {desc}\n' | $ hg l | ||||
| @ changeset: fbe97126b3969056795c462a67d93faf13e4d298 | @ changeset: fbe97126b3969056795c462a67d93faf13e4d298 | ||||
| | desc: mod b | | desc: mod b | ||||
| o changeset: d760186dd240fc47b91eb9f0b58b0002aaeef95d | o changeset: d760186dd240fc47b91eb9f0b58b0002aaeef95d | ||||
| | desc: mv a b | | desc: mv a b | ||||
| o changeset: 48e1b6ba639d5d7fb313fa7989eebabf99c9eb83 | o changeset: 48e1b6ba639d5d7fb313fa7989eebabf99c9eb83 | ||||
| | desc: randomcommit | | desc: randomcommit | ||||
| o changeset: e5b71fb099c29d9172ef4a23485aaffd497e4cc0 | o changeset: e5b71fb099c29d9172ef4a23485aaffd497e4cc0 | ||||
| desc: initial | desc: initial | ||||
| $ mkdir dir2 | $ mkdir dir2 | ||||
| $ echo b > dir2/a | $ echo b > dir2/a | ||||
| $ hg add dir2/a | $ hg add dir2/a | ||||
| $ hg ci -qm 'create dir2/a' | $ hg ci -qm 'create dir2/a' | ||||
| $ hg up -q 0 | $ hg up -q 0 | ||||
| $ echo b > dir/a | $ echo b > dir/a | ||||
| $ hg ci -qm 'mod dir/a' | $ hg ci -qm 'mod dir/a' | ||||
| $ hg log -G -T 'changeset: {node}\n desc: {desc}\n' | $ hg l | ||||
| @ changeset: 6b2f4cece40fd320f41229f23821256ffc08efea | @ changeset: 6b2f4cece40fd320f41229f23821256ffc08efea | ||||
| | desc: mod dir/a | | desc: mod dir/a | ||||
| | o changeset: 4494bf7efd2e0dfdd388e767fb913a8a3731e3fa | | o changeset: 4494bf7efd2e0dfdd388e767fb913a8a3731e3fa | ||||
| | | desc: create dir2/a | | | desc: create dir2/a | ||||
| | o changeset: b1784dfab6ea6bfafeb11c0ac50a2981b0fe6ade | | o changeset: b1784dfab6ea6bfafeb11c0ac50a2981b0fe6ade | ||||
| |/ desc: mv dir/a dir/b | |/ desc: mv dir/a dir/b | ||||
| o changeset: 36859b8907c513a3a87ae34ba5b1e7eea8c20944 | o changeset: 36859b8907c513a3a87ae34ba5b1e7eea8c20944 | ||||
| desc: initial | desc: initial | ||||
| $ hg add f | $ hg add f | ||||
| $ hg add g | $ hg add g | ||||
| $ hg ci -m 'mv a foo, add many files' | $ hg ci -m 'mv a foo, add many files' | ||||
| $ hg up -q ".^" | $ hg up -q ".^" | ||||
| $ echo b > a | $ echo b > a | ||||
| $ hg ci -m 'mod a' | $ hg ci -m 'mod a' | ||||
| created new head | created new head | ||||
| $ hg log -G -T 'changeset: {node}\n desc: {desc}\n' | $ hg l | ||||
| @ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e | @ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e | ||||
| | desc: mod a | | desc: mod a | ||||
| | o changeset: 8329d5c6bf479ec5ca59b9864f3f45d07213f5a4 | | o changeset: 8329d5c6bf479ec5ca59b9864f3f45d07213f5a4 | ||||
| |/ desc: mv a foo, add many files | |/ desc: mv a foo, add many files | ||||
| o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | ||||
| desc: initial | desc: initial | ||||
| With small limit | With small limit | ||||
| $ hg ci -m initial | $ hg ci -m initial | ||||
| $ hg mv a b | $ hg mv a b | ||||
| $ hg ci -m 'mv a b' | $ hg ci -m 'mv a b' | ||||
| $ hg up -q ".^" | $ hg up -q ".^" | ||||
| $ hg rm a | $ hg rm a | ||||
| $ hg ci -m 'del a' | $ hg ci -m 'del a' | ||||
| created new head | created new head | ||||
| $ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n' | $ hg pl | ||||
| @ changeset: 7d61ee3b1e48577891a072024968428ba465c47b | @ changeset: 7d61ee3b1e48577891a072024968428ba465c47b | ||||
| | desc: del a, phase: draft | | desc: del a, phase: draft | ||||
| | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | ||||
| |/ desc: mv a b, phase: draft | |/ desc: mv a b, phase: draft | ||||
| o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | ||||
| desc: initial, phase: draft | desc: initial, phase: draft | ||||
| $ hg rebase -s 1 -d 2 | $ hg rebase -s 1 -d 2 | ||||
| $ hg add dir/a | $ hg add dir/a | ||||
| $ hg ci -qm initial | $ hg ci -qm initial | ||||
| $ echo b > dir/a | $ echo b > dir/a | ||||
| $ hg ci -qm 'mod dir/a' | $ hg ci -qm 'mod dir/a' | ||||
| $ hg up -q ".^" | $ hg up -q ".^" | ||||
| $ hg mv -q dir/ dir2 | $ hg mv -q dir/ dir2 | ||||
| $ hg ci -qm 'mv dir/ dir2/' | $ hg ci -qm 'mv dir/ dir2/' | ||||
| $ hg log -G -T 'changeset: {node}\n desc: {desc}\n' | $ hg l | ||||
| @ changeset: a33d80b6e352591dfd82784e1ad6cdd86b25a239 | @ changeset: a33d80b6e352591dfd82784e1ad6cdd86b25a239 | ||||
| | desc: mv dir/ dir2/ | | desc: mv dir/ dir2/ | ||||
| | o changeset: 6b2f4cece40fd320f41229f23821256ffc08efea | | o changeset: 6b2f4cece40fd320f41229f23821256ffc08efea | ||||
| |/ desc: mod dir/a | |/ desc: mod dir/a | ||||
| o changeset: 36859b8907c513a3a87ae34ba5b1e7eea8c20944 | o changeset: 36859b8907c513a3a87ae34ba5b1e7eea8c20944 | ||||
| desc: initial | desc: initial | ||||
| $ hg rebase -s . -d 1 | $ hg rebase -s . -d 1 | ||||
| $ hg ci -m 'mv a b' | $ hg ci -m 'mv a b' | ||||
| $ hg mv b c | $ hg mv b c | ||||
| $ hg ci -m 'mv b c' | $ hg ci -m 'mv b c' | ||||
| $ hg up -q 0 | $ hg up -q 0 | ||||
| $ echo c > a | $ echo c > a | ||||
| $ hg ci -m 'mod a' | $ hg ci -m 'mod a' | ||||
| created new head | created new head | ||||
| $ hg log -G -T 'changeset: {node}\n desc: {desc}\n' | $ hg l | ||||
| @ changeset: d413169422167a3fa5275fc5d71f7dea9f5775f3 | @ changeset: d413169422167a3fa5275fc5d71f7dea9f5775f3 | ||||
| | desc: mod a | | desc: mod a | ||||
| | o changeset: d3efd280421d24f9f229997c19e654761c942a71 | | o changeset: d3efd280421d24f9f229997c19e654761c942a71 | ||||
| | | desc: mv b c | | | desc: mv b c | ||||
| | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | ||||
| |/ desc: mv a b | |/ desc: mv a b | ||||
| o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | ||||
| desc: initial | desc: initial | ||||
| $ hg mv a b | $ hg mv a b | ||||
| $ hg ci -m 'mv a b' | $ hg ci -m 'mv a b' | ||||
| $ hg mv b c | $ hg mv b c | ||||
| $ hg ci -m 'mv b c' | $ hg ci -m 'mv b c' | ||||
| $ hg up -q 0 | $ hg up -q 0 | ||||
| $ echo c > a | $ echo c > a | ||||
| $ hg ci -m 'mod a' | $ hg ci -m 'mod a' | ||||
| created new head | created new head | ||||
| $ hg log -G -T 'changeset: {node}\n desc: {desc}\n' | $ hg l | ||||
| @ changeset: d413169422167a3fa5275fc5d71f7dea9f5775f3 | @ changeset: d413169422167a3fa5275fc5d71f7dea9f5775f3 | ||||
| | desc: mod a | | desc: mod a | ||||
| | o changeset: d3efd280421d24f9f229997c19e654761c942a71 | | o changeset: d3efd280421d24f9f229997c19e654761c942a71 | ||||
| | | desc: mv b c | | | desc: mv b c | ||||
| | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | ||||
| |/ desc: mv a b | |/ desc: mv a b | ||||
| o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | ||||
| desc: initial | desc: initial | ||||
| $ echo c > c | $ echo c > c | ||||
| $ hg add c | $ hg add c | ||||
| $ hg ci -m 'add c' | $ hg ci -m 'add c' | ||||
| $ hg up -q 0 | $ hg up -q 0 | ||||
| $ echo b > a | $ echo b > a | ||||
| $ hg ci -m 'mod a' | $ hg ci -m 'mod a' | ||||
| created new head | created new head | ||||
| $ hg log -G -T 'changeset: {node}\n desc: {desc}\n' | $ hg l | ||||
| @ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e | @ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e | ||||
| | desc: mod a | | desc: mod a | ||||
| | o changeset: b1a6187e79fbce851bb584eadcb0cc4a80290fd9 | | o changeset: b1a6187e79fbce851bb584eadcb0cc4a80290fd9 | ||||
| | | desc: add c | | | desc: add c | ||||
| | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | ||||
| |/ desc: mv a b | |/ desc: mv a b | ||||
| o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | ||||
| desc: initial | desc: initial | ||||
| $ echo b > a | $ echo b > a | ||||
| $ hg ci -m 'modify a' | $ hg ci -m 'modify a' | ||||
| $ hg up -q 0 | $ hg up -q 0 | ||||
| $ hg mv a b | $ hg mv a b | ||||
| $ hg ci -m 'mv a b' | $ hg ci -m 'mv a b' | ||||
| created new head | created new head | ||||
| $ hg up -q 2 | $ hg up -q 2 | ||||
| $ hg log -G -T 'changeset: {node}\n desc: {desc}\n' | $ hg l | ||||
| @ changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | @ changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | ||||
| | desc: mv a b | | desc: mv a b | ||||
| | o changeset: b0357b07f79129a3d08a68621271ca1352ae8a09 | | o changeset: b0357b07f79129a3d08a68621271ca1352ae8a09 | ||||
| |/ desc: modify a | |/ desc: modify a | ||||
| o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | ||||
| desc: initial | desc: initial | ||||
| $ hg merge 1 | $ hg merge 1 | ||||
| $ hg cp a c | $ hg cp a c | ||||
| $ hg mv a b | $ hg mv a b | ||||
| $ hg ci -m 'cp a c, mv a b' | $ hg ci -m 'cp a c, mv a b' | ||||
| $ hg up -q 0 | $ hg up -q 0 | ||||
| $ echo b > a | $ echo b > a | ||||
| $ hg ci -m 'mod a' | $ hg ci -m 'mod a' | ||||
| created new head | created new head | ||||
| $ hg log -G -T 'changeset: {node}\n desc: {desc}\n' | $ hg l | ||||
| @ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e | @ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e | ||||
| | desc: mod a | | desc: mod a | ||||
| | o changeset: 4fc3fd13fbdb89ada6b75bfcef3911a689a0dde8 | | o changeset: 4fc3fd13fbdb89ada6b75bfcef3911a689a0dde8 | ||||
| |/ desc: cp a c, mv a b | |/ desc: cp a c, mv a b | ||||
| o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | ||||
| desc: initial | desc: initial | ||||
| $ hg rebase -s . -d 1 | $ hg rebase -s . -d 1 | ||||
| $ echo b > a | $ echo b > a | ||||
| $ hg ci -qm 'mod a' | $ hg ci -qm 'mod a' | ||||
| $ hg up -q ".^" | $ hg up -q ".^" | ||||
| $ hg mv a b | $ hg mv a b | ||||
| $ hg ci -qm 'mv a b' | $ hg ci -qm 'mv a b' | ||||
| $ hg mv b c | $ hg mv b c | ||||
| $ hg ci -qm 'mv b c' | $ hg ci -qm 'mv b c' | ||||
| $ hg up -q 1 | $ hg up -q 1 | ||||
| $ hg log -G -T 'changeset: {node}\n desc: {desc}\n' | $ hg l | ||||
| o changeset: d3efd280421d24f9f229997c19e654761c942a71 | o changeset: d3efd280421d24f9f229997c19e654761c942a71 | ||||
| | desc: mv b c | | desc: mv b c | ||||
| o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | ||||
| | desc: mv a b | | desc: mv a b | ||||
| | @ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e | | @ changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e | ||||
| |/ desc: mod a | |/ desc: mod a | ||||
| o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | ||||
| desc: initial | desc: initial | ||||
| $ hg merge 3 | $ hg merge 3 | ||||
| merging a and c to c | merging a and c to c | ||||
| 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||||
| (branch merge, don't forget to commit) | (branch merge, don't forget to commit) | ||||
| $ hg ci -qm 'merge' | $ hg ci -qm 'merge' | ||||
| $ hg log -G -T 'changeset: {node}\n desc: {desc}, phase: {phase}\n' | $ hg pl | ||||
| @ changeset: cd29b0d08c0f39bfed4cde1b40e30f419db0c825 | @ changeset: cd29b0d08c0f39bfed4cde1b40e30f419db0c825 | ||||
| |\ desc: merge, phase: draft | |\ desc: merge, phase: draft | ||||
| | o changeset: d3efd280421d24f9f229997c19e654761c942a71 | | o changeset: d3efd280421d24f9f229997c19e654761c942a71 | ||||
| | | desc: mv b c, phase: draft | | | desc: mv b c, phase: draft | ||||
| | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | | o changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | ||||
| | | desc: mv a b, phase: draft | | | desc: mv a b, phase: draft | ||||
| o | changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e | o | changeset: ef716627c70bf4ca0bdb623cfb0d6fe5b9acc51e | ||||
| |/ desc: mod a, phase: draft | |/ desc: mod a, phase: draft | ||||
| $ hg ci -m initial | $ hg ci -m initial | ||||
| $ echo b > a | $ echo b > a | ||||
| $ hg shelve | $ hg shelve | ||||
| shelved as default | shelved as default | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| $ hg mv a b | $ hg mv a b | ||||
| $ hg ci -m 'mv a b' | $ hg ci -m 'mv a b' | ||||
| $ hg log -G -T 'changeset: {node}\n desc: {desc}\n' | $ hg l | ||||
| @ changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | @ changeset: 472e38d57782172f6c6abed82a94ca0d998c3a22 | ||||
| | desc: mv a b | | desc: mv a b | ||||
| o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 | ||||
| desc: initial | desc: initial | ||||
| $ hg unshelve | $ hg unshelve | ||||
| unshelving change 'default' | unshelving change 'default' | ||||
| rebasing shelved changes | rebasing shelved changes | ||||
| merging b and a to b | merging b and a to b | ||||
| $ hg mv dir2/a dir2/b | $ hg mv dir2/a dir2/b | ||||
| $ hg ci -qm 'mv a b; mv dir1 dir2' | $ hg ci -qm 'mv a b; mv dir1 dir2' | ||||
| $ hg up -q '.^' | $ hg up -q '.^' | ||||
| $ cd dir1 | $ cd dir1 | ||||
| $ echo b >> a | $ echo b >> a | ||||
| $ cd .. | $ cd .. | ||||
| $ hg ci -qm 'mod a' | $ hg ci -qm 'mod a' | ||||
| $ hg log -G -T 'changeset {node}\n desc {desc}, phase: {phase}\n' | $ hg pl | ||||
| @ changeset 6207d2d318e710b882e3d5ada2a89770efc42c96 | @ changeset: 6207d2d318e710b882e3d5ada2a89770efc42c96 | ||||
| | desc mod a, phase: draft | | desc: mod a, phase: draft | ||||
| | o changeset abffdd4e3dfc04bc375034b970299b2a309a1cce | | o changeset: abffdd4e3dfc04bc375034b970299b2a309a1cce | ||||
| |/ desc mv a b; mv dir1 dir2, phase: draft | |/ desc: mv a b; mv dir1 dir2, phase: draft | ||||
| o changeset 81973cd24b58db2fdf18ce3d64fb2cc3284e9ab3 | o changeset: 81973cd24b58db2fdf18ce3d64fb2cc3284e9ab3 | ||||
| desc initial, phase: draft | desc: initial, phase: draft | ||||
| $ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100 | $ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100 | ||||
| rebasing 2:6207d2d318e7 "mod a" (tip) | rebasing 2:6207d2d318e7 "mod a" (tip) | ||||
| merging dir2/b and dir1/a to dir2/b | merging dir2/b and dir1/a to dir2/b | ||||
| saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/6207d2d318e7-1c9779ad-rebase.hg | saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/6207d2d318e7-1c9779ad-rebase.hg | ||||
| $ cat dir2/b | $ cat dir2/b | ||||
| a | a | ||||
| b | b | ||||
| $ echo a > a | $ echo a > a | ||||
| $ hg add a | $ hg add a | ||||
| $ cd .. | $ cd .. | ||||
| $ hg ci -qm 'hg add dir1/a' | $ hg ci -qm 'hg add dir1/a' | ||||
| $ hg up -q '.^' | $ hg up -q '.^' | ||||
| $ hg mv -q dir1 dir2 | $ hg mv -q dir1 dir2 | ||||
| $ hg ci -qm 'mv dir1 dir2' | $ hg ci -qm 'mv dir1 dir2' | ||||
| $ hg log -G -T 'changeset {node}\n desc {desc}, phase: {phase}\n' | $ hg pl | ||||
| @ changeset e8919e7df8d036e07b906045eddcd4a42ff1915f | @ changeset: e8919e7df8d036e07b906045eddcd4a42ff1915f | ||||
| | desc mv dir1 dir2, phase: draft | | desc: mv dir1 dir2, phase: draft | ||||
| | o changeset 7c7c6f339be00f849c3cb2df738ca91db78b32c8 | | o changeset: 7c7c6f339be00f849c3cb2df738ca91db78b32c8 | ||||
| |/ desc hg add dir1/a, phase: draft | |/ desc: hg add dir1/a, phase: draft | ||||
| o changeset a235dcce55dcf42034c4e374cb200662d0bb4a13 | o changeset: a235dcce55dcf42034c4e374cb200662d0bb4a13 | ||||
| desc initial, phase: draft | desc: initial, phase: draft | ||||
| $ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100 | $ hg rebase -s . -d 1 --config experimental.copytrace.sourcecommitlimit=100 | ||||
| rebasing 2:e8919e7df8d0 "mv dir1 dir2" (tip) | rebasing 2:e8919e7df8d0 "mv dir1 dir2" (tip) | ||||
| saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/e8919e7df8d0-f62fab62-rebase.hg | saved backup bundle to $TESTTMP/repo/repo/.hg/strip-backup/e8919e7df8d0-f62fab62-rebase.hg | ||||
| $ ls dir2 | $ ls dir2 | ||||
| a | a | ||||
| dummy | dummy | ||||
| $ rm -rf repo | $ rm -rf repo | ||||
| $ hg ci -qm "added more things to a" | $ hg ci -qm "added more things to a" | ||||
| $ hg up 0 | $ hg up 0 | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| $ echo b > b | $ echo b > b | ||||
| $ hg ci -Aqm "added b" | $ hg ci -Aqm "added b" | ||||
| $ mkdir foo | $ mkdir foo | ||||
| $ hg mv a foo/bar | $ hg mv a foo/bar | ||||
| $ hg ci -m "Moved a to foo/bar" | $ hg ci -m "Moved a to foo/bar" | ||||
| $ hg log -G -T 'changeset {node}\n desc {desc}, phase: {phase}\n' | $ hg pl | ||||
| @ changeset b4b0f7880e500b5c364a5f07b4a2b167de7a6fb0 | @ changeset: b4b0f7880e500b5c364a5f07b4a2b167de7a6fb0 | ||||
| | desc Moved a to foo/bar, phase: draft | | desc: Moved a to foo/bar, phase: draft | ||||
| o changeset 5f6d8a4bf34ab274ccc9f631c2536964b8a3666d | o changeset: 5f6d8a4bf34ab274ccc9f631c2536964b8a3666d | ||||
| | desc added b, phase: draft | | desc: added b, phase: draft | ||||
| | o changeset 8b6e13696c38e8445a759516474640c2f8dddef6 | | o changeset: 8b6e13696c38e8445a759516474640c2f8dddef6 | ||||
| |/ desc added more things to a, phase: draft | |/ desc: added more things to a, phase: draft | ||||
| o changeset 9092f1db7931481f93b37d5c9fbcfc341bcd7318 | o changeset: 9092f1db7931481f93b37d5c9fbcfc341bcd7318 | ||||
| desc added a, phase: draft | desc: added a, phase: draft | ||||
| When the sourcecommitlimit is small and we have more drafts, we use heuristics only | When the sourcecommitlimit is small and we have more drafts, we use heuristics only | ||||
| $ hg rebase -s 8b6e13696 -d . | $ hg rebase -s 8b6e13696 -d . | ||||
| rebasing 1:8b6e13696c38 "added more things to a" | rebasing 1:8b6e13696c38 "added more things to a" | ||||
| file 'a' was deleted in local [dest] but was modified in other [source]. | file 'a' was deleted in local [dest] but was modified in other [source]. | ||||
| What do you want to do? | What do you want to do? | ||||
| use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u | ||||