Mercurial > evolve
changeset 5013:18fe83bf7b14
evolve: move a test where it makes more sense
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Fri, 13 Dec 2019 01:29:27 +0530 |
| parents | 5b5cfb9b0a0b |
| children | 35870ce163ee |
| files | tests/test-evolve-content-divergent-meta.t tests/test-evolve-issue5958.t |
| diffstat | 2 files changed, 211 insertions(+), 168 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-meta.t Thu Dec 12 17:22:18 2019 +0530 +++ b/tests/test-evolve-content-divergent-meta.t Fri Dec 13 01:29:27 2019 +0530 @@ -14,6 +14,7 @@ > publish = False > [extensions] > rebase = + > strip = > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH @@ -157,3 +158,213 @@ user: baruser, foouser $ cd .. + +Test the content-divergence resolution involving date update +------------------------------------------------------------ + + $ hg init divergingdate + $ cd divergingdate + $ unset HGUSER + $ echo "[ui]" >> ./.hg/hgrc + $ echo "username = test" >> ./.hg/hgrc + + $ echo hi > r0 + $ hg ci -qAm 'add r0' + $ echo hi > foo.txt + $ hg ci -qAm 'add foo.txt' + $ hg metaedit -r . -d '0 2' + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved + +date: updated on both side to the same value + + $ echo hi > bar.txt + $ hg add -q bar.txt + $ hg amend -q + $ hg metaedit -r 1 -d '0 1' --hidden + 2 new content-divergent changesets + $ hg log -G + * changeset: 4:c17bf400a278 + | tag: tip + | parent: 0:a24ed8ad918c + | user: test + | date: Wed Dec 31 23:59:59 1969 -0000 + | instability: content-divergent + | summary: add foo.txt + | + | @ changeset: 3:a25dd7af6cf6 + |/ parent: 0:a24ed8ad918c + | user: test + | date: Wed Dec 31 23:59:58 1969 -0000 + | instability: content-divergent + | summary: add foo.txt + | + o changeset: 0:a24ed8ad918c + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: add r0 + + $ hg evolve --list --rev . + a25dd7af6cf6: add foo.txt + content-divergent: c17bf400a278 (draft) (precursor cc71ffbc7c00) + + $ hg log --hidden -r cc71ffbc7c00 -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' + 1 cc71ffbc7c00 1970-01-01 00:00 +0000: date-changed using metaedit as 4:c17bf400a278; date-changed using metaedit as 2:0065551bd38f + $ hg log -r 'desc("add foo.txt")' -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' + 3 a25dd7af6cf6 1969-12-31 23:59 -0000: + 4 c17bf400a278 1969-12-31 23:59 -0000: + $ hg evolve --content-divergent + merge:[3] add foo.txt + with: [4] add foo.txt + base: [1] add foo.txt + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved + working directory is now at 6c144bb30333 + $ hg log -r 'desc("add foo.txt")' -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' + 5 6c144bb30333 1969-12-31 23:59 -0000: + +date: updated one one side to an older value + + $ hg strip . + 0 files updated, 0 files merged, 2 files removed, 0 files unresolved + saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/6c144bb30333-72e26b88-backup.hg + 2 new content-divergent changesets + $ hg up tip + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg amend --date "0 3" + $ hg log -G + @ changeset: 5:6189a9adfff0 + | tag: tip + | parent: 0:a24ed8ad918c + | user: test + | date: Wed Dec 31 23:59:57 1969 -0000 + | instability: content-divergent + | summary: add foo.txt + | + | * changeset: 3:a25dd7af6cf6 + |/ parent: 0:a24ed8ad918c + | user: test + | date: Wed Dec 31 23:59:58 1969 -0000 + | instability: content-divergent + | summary: add foo.txt + | + o changeset: 0:a24ed8ad918c + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: add r0 + + $ hg evolve --list -r . + 6189a9adfff0: add foo.txt + content-divergent: a25dd7af6cf6 (draft) (precursor cc71ffbc7c00) + + $ hg log -r cc71ffbc7c00+6189a9adfff0+a25dd7af6cf6 --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' + 1 cc71ffbc7c00 1970-01-01 00:00 +0000: date-changed using metaedit as 4:c17bf400a278; date-changed using metaedit as 2:0065551bd38f + 5 6189a9adfff0 1969-12-31 23:59 -0000: + 3 a25dd7af6cf6 1969-12-31 23:59 -0000: + $ hg evolve --content-divergent + merge:[3] add foo.txt + with: [5] add foo.txt + base: [1] add foo.txt + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved + working directory is now at 806d0024c04d + $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' + 6 806d0024c04d 1969-12-31 23:59 -0000: + +date: updated one side to an newer value + + $ hg strip . + 0 files updated, 0 files merged, 2 files removed, 0 files unresolved + saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/806d0024c04d-24cb28ad-backup.hg + 2 new content-divergent changesets + $ hg update a25dd7af6cf6 --hidden + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg amend --date "120 0" + $ hg log -G + @ changeset: 6:5199d0bc13d4 + | tag: tip + | parent: 0:a24ed8ad918c + | user: test + | date: Thu Jan 01 00:02:00 1970 +0000 + | instability: content-divergent + | summary: add foo.txt + | + | * changeset: 5:6189a9adfff0 + |/ parent: 0:a24ed8ad918c + | user: test + | date: Wed Dec 31 23:59:57 1969 -0000 + | instability: content-divergent + | summary: add foo.txt + | + o changeset: 0:a24ed8ad918c + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: add r0 + + $ hg evolve --list -r . + 5199d0bc13d4: add foo.txt + content-divergent: 6189a9adfff0 (draft) (precursor cc71ffbc7c00) + + $ hg up 6189a9adfff0 + 0 files updated, 0 files merged, 1 files removed, 0 files unresolved + $ hg log -r cc71ffbc7c00+6189a9adfff0+5199d0bc13d4 --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' + 1 cc71ffbc7c00 1970-01-01 00:00 +0000: date-changed using metaedit as 4:c17bf400a278; date-changed using metaedit as 2:0065551bd38f + 5 6189a9adfff0 1969-12-31 23:59 -0000: + 6 5199d0bc13d4 1970-01-01 00:02 +0000: + $ hg evolve --content-divergent + merge:[5] add foo.txt + with: [6] add foo.txt + base: [1] add foo.txt + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + working directory is now at 51e08ac59670 + $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' + 7 51e08ac59670 1970-01-01 00:02 +0000: + +date: updated each side to a different value, newer should win + + $ hg strip . + 0 files updated, 0 files merged, 2 files removed, 0 files unresolved + saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/51e08ac59670-d8a3c2ca-backup.hg + 2 new content-divergent changesets + $ hg up tip + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg amend --date "235 0" + $ hg update 6189a9adfff0 --hidden + 0 files updated, 0 files merged, 1 files removed, 0 files unresolved + $ hg amend --date "784 0" + $ hg log -G + @ changeset: 8:75254fb3164b + | tag: tip + | parent: 0:a24ed8ad918c + | user: test + | date: Thu Jan 01 00:13:04 1970 +0000 + | instability: content-divergent + | summary: add foo.txt + | + | * changeset: 7:5421a7efcc6e + |/ parent: 0:a24ed8ad918c + | user: test + | date: Thu Jan 01 00:03:55 1970 +0000 + | instability: content-divergent + | summary: add foo.txt + | + o changeset: 0:a24ed8ad918c + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: add r0 + + $ hg evolve --list -r . + 75254fb3164b: add foo.txt + content-divergent: 5421a7efcc6e (draft) (precursor cc71ffbc7c00) + + $ hg log -r 6189a9adfff0+5421a7efcc6e+75254fb3164b --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' + 5 6189a9adfff0 1969-12-31 23:59 -0000: date-changed using amend as 8:75254fb3164b + 7 5421a7efcc6e 1970-01-01 00:03 +0000: + 8 75254fb3164b 1970-01-01 00:13 +0000: + $ hg evolve --content-divergent + merge:[7] add foo.txt + with: [8] add foo.txt + base: [1] add foo.txt + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved + working directory is now at ab7c0a425dc9 + $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' + 9 ab7c0a425dc9 1970-01-01 00:13 +0000: + + $ cd ..
--- a/tests/test-evolve-issue5958.t Thu Dec 12 17:22:18 2019 +0530 +++ b/tests/test-evolve-issue5958.t Fri Dec 13 01:29:27 2019 +0530 @@ -22,8 +22,6 @@ (Make changes in unrelated files so that we don't have any merge conflicts during the rebase, but the two touched revisions aren't identical) -date: updated on both side to the same value - $ echo hi > bar.txt $ hg add -q bar.txt $ hg amend -q @@ -81,15 +79,6 @@ rewritten(date) as 0065551bd38f using metaedit by test (Thu Jan 01 00:00:00 1970 +0000) rewritten(date) as c17bf400a278 using metaedit by test (Thu Jan 01 00:00:00 1970 +0000) - $ hg evolve --list --rev . - 08bc7ba82799: add foo.txt - content-divergent: c17bf400a278 (draft) (precursor cc71ffbc7c00) - - $ hg log --hidden -r cc71ffbc7c00 -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' - 1 cc71ffbc7c00 1970-01-01 00:00 +0000: date-changed using metaedit as 4:c17bf400a278; date-changed using metaedit as 2:0065551bd38f - $ hg log -r 'desc("add foo.txt")' -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' - 4 c17bf400a278 1969-12-31 23:59 -0000: - 6 08bc7ba82799 1969-12-31 23:59 -0000: $ hg evolve --content-divergent merge:[6] add foo.txt with: [4] add foo.txt @@ -97,160 +86,3 @@ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 new orphan changesets working directory is now at 459c64f7eaad - $ hg log -r 'desc("add foo.txt")' -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' - 4 c17bf400a278 1969-12-31 23:59 -0000: rewritten using evolve as 7:459c64f7eaad - 7 459c64f7eaad 1969-12-31 23:59 -0000: - -date: updated one one side to an older value - - $ hg evolve -r . - move:[7] add foo.txt - atop:[0] add r0 - working directory is now at 545776b4e79f - $ hg update --hidden --rev 'predecessors(.)' - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 459c64f7eaad - (hidden revision '459c64f7eaad' was rewritten as: 545776b4e79f) - working directory parent is obsolete! (459c64f7eaad) - (use 'hg evolve' to update to its successor: 545776b4e79f) - $ hg amend --date "0 3" - 1 new orphan changesets - 2 new content-divergent changesets - $ hg rebase -r . -d 0 - rebasing 9:c117f15338e6 "add foo.txt" (tip) - $ hg log -G - @ changeset: 10:7a09c7a39546 - | tag: tip - | parent: 0:a24ed8ad918c - | user: test - | date: Wed Dec 31 23:59:57 1969 -0000 - | instability: content-divergent - | summary: add foo.txt - | - | * changeset: 8:545776b4e79f - |/ parent: 0:a24ed8ad918c - | user: test - | date: Wed Dec 31 23:59:58 1969 -0000 - | instability: content-divergent - | summary: add foo.txt - | - o changeset: 0:a24ed8ad918c - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: add r0 - - $ hg evolve --list -r . - 7a09c7a39546: add foo.txt - content-divergent: 545776b4e79f (draft) (precursor 459c64f7eaad) - - $ hg log -r 459c64f7eaad+7a09c7a39546+545776b4e79f --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' - 7 459c64f7eaad 1969-12-31 23:59 -0000: date-changed using amend as 9:c117f15338e6; rebased using evolve as 8:545776b4e79f - 10 7a09c7a39546 1969-12-31 23:59 -0000: - 8 545776b4e79f 1969-12-31 23:59 -0000: - $ hg evolve --content-divergent - merge:[8] add foo.txt - with: [10] add foo.txt - base: [7] add foo.txt - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory is now at 39c4200c0d94 - $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' - 11 39c4200c0d94 1969-12-31 23:59 -0000: - -date: updated one side to an newer value - - $ hg update --hidden --rev 'predecessors(.)' - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 7a09c7a39546 - (hidden revision '7a09c7a39546' was rewritten as: 39c4200c0d94) - working directory parent is obsolete! (7a09c7a39546) - (use 'hg evolve' to update to its successor: 39c4200c0d94) - $ hg amend --date "120 0" - 2 new content-divergent changesets - $ hg log -G - @ changeset: 12:da3be3d72fe2 - | tag: tip - | parent: 0:a24ed8ad918c - | user: test - | date: Thu Jan 01 00:02:00 1970 +0000 - | instability: content-divergent - | summary: add foo.txt - | - | * changeset: 11:39c4200c0d94 - |/ parent: 0:a24ed8ad918c - | user: test - | date: Wed Dec 31 23:59:57 1969 -0000 - | instability: content-divergent - | summary: add foo.txt - | - o changeset: 0:a24ed8ad918c - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: add r0 - - $ hg evolve --list -r . - da3be3d72fe2: add foo.txt - content-divergent: 39c4200c0d94 (draft) (precursor 7a09c7a39546) - - $ hg up 39c4200c0d94 - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg log -r 7a09c7a39546+39c4200c0d94+da3be3d72fe2 --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' - 10 7a09c7a39546 1969-12-31 23:59 -0000: date-changed using amend as 12:da3be3d72fe2; rewritten using evolve as 11:39c4200c0d94 - 11 39c4200c0d94 1969-12-31 23:59 -0000: - 12 da3be3d72fe2 1970-01-01 00:02 +0000: - $ hg evolve --content-divergent - merge:[11] add foo.txt - with: [12] add foo.txt - base: [10] add foo.txt - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory is now at 06cde6010a51 - $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' - 13 06cde6010a51 1970-01-01 00:02 +0000: - -date: updated each side to a different value, newer should win - - $ hg amend --date "235 0" - $ hg update --hidden --rev 'predecessors(.)' - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - updated to hidden changeset 06cde6010a51 - (hidden revision '06cde6010a51' was rewritten as: a7412ff9bfb3) - working directory parent is obsolete! (06cde6010a51) - (use 'hg evolve' to update to its successor: a7412ff9bfb3) - $ hg amend --date "784 0" - 2 new content-divergent changesets - $ hg log -G - @ changeset: 15:e3077936ec52 - | tag: tip - | parent: 0:a24ed8ad918c - | user: test - | date: Thu Jan 01 00:13:04 1970 +0000 - | instability: content-divergent - | summary: add foo.txt - | - | * changeset: 14:a7412ff9bfb3 - |/ parent: 0:a24ed8ad918c - | user: test - | date: Thu Jan 01 00:03:55 1970 +0000 - | instability: content-divergent - | summary: add foo.txt - | - o changeset: 0:a24ed8ad918c - user: test - date: Thu Jan 01 00:00:00 1970 +0000 - summary: add r0 - - $ hg evolve --list -r . - e3077936ec52: add foo.txt - content-divergent: a7412ff9bfb3 (draft) (precursor 06cde6010a51) - - $ hg log -r 39c4200c0d94+a7412ff9bfb3+e3077936ec52 --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' - 11 39c4200c0d94 1969-12-31 23:59 -0000: date-changed using evolve as 13:06cde6010a51 - 14 a7412ff9bfb3 1970-01-01 00:03 +0000: - 15 e3077936ec52 1970-01-01 00:13 +0000: - $ hg evolve --content-divergent - merge:[14] add foo.txt - with: [15] add foo.txt - base: [13] add foo.txt - 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory is now at 1a39f3901288 - $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' - 16 1a39f3901288 1970-01-01 00:13 +0000: