Mercurial > hg
view tests/test-parse-date @ 5239:8860f29447c1
imerge: fix ancestor calculation
If wctx already has two parents, ancestor calculation is wrong.
Normally merge is called before wctx gets the second parent, so
we simulate this in imerge by temporarily popping the second parent
before calling filemerge. Highly dirty.
This patch also handles the ParseError move from cmdutil to dispatch.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Thu, 23 Aug 2007 19:51:59 -0700 |
parents | e5c9a084ffe3 |
children | ad6b123de1c7 |
line wrap: on
line source
#!/bin/sh # This runs with TZ="GMT" hg init echo "test-parse-date" > a hg add a hg ci -d "2006-02-01 13:00:30" -m "rev 0" echo "hi!" >> a hg ci -d "2006-02-01 13:00:30 -0500" -m "rev 1" hg tag -d "2006-04-15 13:30" "Hi" hg backout --merge -d "2006-04-15 13:30 +0200" -m "rev 3" 1 hg ci -d "1150000000 14400" -m "rev 4 (merge)" echo "fail" >> a hg ci -d "should fail" -m "fail" hg ci -d "100000000000000000 1400" -m "fail" hg ci -d "100000 1400000" -m "fail" # Check with local timezone other than GMT and with DST TZ="PST+8PDT" export TZ # PST=UTC-8 / PDT=UTC-7 hg debugrebuildstate echo "a" > a hg ci -d "2006-07-15 13:30" -m "summer@UTC-7" hg debugrebuildstate echo "b" > a hg ci -d "2006-07-15 13:30 +0500" -m "summer@UTC+5" hg debugrebuildstate echo "c" > a hg ci -d "2006-01-15 13:30" -m "winter@UTC-8" hg debugrebuildstate echo "d" > a hg ci -d "2006-01-15 13:30 +0500" -m "winter@UTC+5" hg log --template '{date|date}\n'