Mercurial > hgrepos > DevTools > mercurial-extensions
changeset 282:4c3a0656f86d
Test timestamps with merging r8 into r8 also
| author | Franz Glasner <hg@dom66.de> |
|---|---|
| date | Sun, 06 Jan 2019 20:09:00 +0100 |
| parents | ee524547e57d |
| children | dc83e8e3346c |
| files | tests/test-timestamps.t |
| diffstat | 1 files changed, 48 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-timestamps.t Sun Jan 06 20:06:46 2019 +0100 +++ b/tests/test-timestamps.t Sun Jan 06 20:09:00 2019 +0100 @@ -254,3 +254,51 @@ $ "$TSPY" "$TESTDIR/lib-stat.py" --check=2017-12-01T06:07:08Z files/test4-2.txt $ cd .. + + +4. Test the merge with conflicts the other way round +==================================================== + + $ prepare_repo "ts4" + $ cd ts4 + $ hg update --quiet -r7 + $ hg merge -r8 --tool=:merge3 + merging .hgtimestamps.db + merging files/test2.txt + warning: conflicts while merging .hgtimestamps.db! (edit, then use 'hg resolve --mark') + warning: conflicts while merging files/test2.txt! (edit, then use 'hg resolve --mark') + 1 files updated, 0 files merged, 0 files removed, 2 files unresolved + use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon + [1] + $ cat .hgtimestamps.db + version=1 + encoding=binary + files/test1.txt,2017-12-01T02:03:04Z + <<<<<<< working copy: * (glob) + files/test2.txt,2017-12-01T07:08:09Z + files/test4-2.txt,2017-12-01T06:07:08Z + ||||||| base + files/test2.txt,2017-12-01T04:05:06Z + ======= + files/test2.txt,2017-12-01T08:09:10Z + files/test3.txt,2017-12-01T05:06:07Z + >>>>>>> merge rev: * (glob) + $ ls -1 files + test1.txt + test2.txt + test2.txt.orig (?) + test3.txt + test4-2.txt + +Again: unchanged files should have there old timestamps, new files in +`other' should have their respective stored old timestamp. Only +changed/conflicting files should have a new modtime. + + $ "$TSPY" "$TESTDIR/lib-stat.py" --check=2017-12-01T02:03:04Z files/test1.txt + $ "$TSPY" "$TESTDIR/lib-stat.py" --differs=2017-12-01T07:08:09Z files/test2.txt + $ "$TSPY" "$TESTDIR/lib-stat.py" --differs=2017-12-01T08:09:10Z files/test2.txt + $ "$TSPY" "$TESTDIR/lib-stat.py" --differs=2017-12-01T04:05:06Z files/test2.txt + $ "$TSPY" "$TESTDIR/lib-stat.py" --check=2017-12-01T05:06:07Z files/test3.txt + $ "$TSPY" "$TESTDIR/lib-stat.py" --check=2017-12-01T06:07:08Z files/test4-2.txt + + $ cd ..