Mercurial > evolve
diff tests/test-evolve-content-divergent-meta.t @ 5297:a73cdef2e33f
evolve: rename `evolve_source_*` to `divergence_source_*`
This makes it clearer that this comes from divergence resolution.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 08 May 2020 04:02:22 +0200 |
| parents | 13376ca93fa3 |
| children | 88f9bbba392d |
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-meta.t Thu May 07 07:57:14 2020 -0700 +++ b/tests/test-evolve-content-divergent-meta.t Fri May 08 04:02:22 2020 +0200 @@ -93,7 +93,7 @@ Make sure resultant cset don't replace the initial user with user running the command: $ hg log -r tip - changeset: 5:51370cfb7970 + changeset: 5:8cabe7248d20 tag: tip parent: 1:1740ad2a1eda user: foo <foo@test.com> @@ -133,7 +133,7 @@ with: [4] added c base: [2] added c 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory is now at 2c906136b0c8 + working directory is now at 2300a271820b $ hg log -r tip | grep "^user" user: foouser @@ -154,7 +154,7 @@ with: [5] updated c base: [2] added c 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - working directory is now at f530f5fa1045 + working directory is now at 3d7ae55fbfe4 $ hg log -r tip | grep "^user" user: baruser, foouser @@ -219,15 +219,15 @@ 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 02379380f598 + working directory is now at bbcfcd9b9e21 $ hg log -r 'desc("add foo.txt")' -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' - 5 02379380f598 1969-12-31 23:59 -0000: + 5 bbcfcd9b9e21 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/02379380f598-2f67671c-backup.hg + saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/bbcfcd9b9e21-567273f3-backup.hg 2 new content-divergent changesets $ hg up tip 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -266,15 +266,15 @@ 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 ab764e1dbab6 + working directory is now at 4708538fed7d $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' - 6 ab764e1dbab6 1969-12-31 23:59 -0000: + 6 4708538fed7d 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/ab764e1dbab6-970f1c73-backup.hg + saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/4708538fed7d-ca550351-backup.hg 2 new content-divergent changesets $ hg update a25dd7af6cf6 --hidden 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -315,15 +315,15 @@ 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 d294ee10286d + working directory is now at dbea1c7e245d $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' - 7 d294ee10286d 1970-01-01 00:02 +0000: + 7 dbea1c7e245d 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/d294ee10286d-09948d16-backup.hg + saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/dbea1c7e245d-47ae3d98-backup.hg 2 new content-divergent changesets $ hg up tip 2 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -365,8 +365,8 @@ 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 1cdf2cb09946 + working directory is now at 10c950c7c11f $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' - 9 1cdf2cb09946 1970-01-01 00:13 +0000: + 9 10c950c7c11f 1970-01-01 00:13 +0000: $ cd ..