Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-conflict @ 1933:7544700fd931

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Some systems show "Thu Jan 01" instead of "Thu Jan 1", which breaks tests. Using "1000000" yields "Mon Jan 12 13:46:40 1970", which looks the same on all systems.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 13 Mar 2006 13:05:41 +0100
parents c71420b186b0
children e506c14382fd
comparison
equal deleted inserted replaced
1932:82995896d5af 1933:7544700fd931
1 #!/bin/sh 1 #!/bin/sh
2 2
3 hg init 3 hg init
4 echo "nothing" > a 4 echo "nothing" > a
5 hg add a 5 hg add a
6 hg commit -m ancestor -d "0 0" 6 hg commit -m ancestor -d "1000000 0"
7 echo "something" > a 7 echo "something" > a
8 hg commit -m branch1 -d "0 0" 8 hg commit -m branch1 -d "1000000 0"
9 hg co 0 9 hg co 0
10 echo "something else" > a 10 echo "something else" > a
11 hg commit -m branch2 -d "0 0" 11 hg commit -m branch2 -d "1000000 0"
12 HGMERGE=merge; export HGMERGE 12 HGMERGE=merge; export HGMERGE
13 hg up -m 1 13 hg up -m 1
14 hg id 14 hg id
15 egrep -v ">>>|<<<" a 15 egrep -v ">>>|<<<" a
16 hg status 16 hg status