Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-parse-date.out @ 3295:764688cf51e5
merge: remember rename copies and parents properly on commit
record copies in dirstate even if rename was remote
this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 08 Oct 2006 19:57:45 -0500 |
parents | c9cd63a6fce9 |
children | 92a3532a01d9 |
rev | line source |
---|---|
2522
85f796baab10
Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff
changeset
|
1 reverting a |
85f796baab10
Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff
changeset
|
2 changeset 3:107ce1ee2b43 backs out changeset 1:25a1420a55f8 |
2974
eef469259745
tag: shorten hash in default commit message
Matt Mackall <mpm@selenic.com>
parents:
2524
diff
changeset
|
3 merging with changeset 2:e6c3abc120e7 |
2522
85f796baab10
Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff
changeset
|
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
85f796baab10
Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff
changeset
|
5 (branch merge, don't forget to commit) |
3252
c9cd63a6fce9
Add documentation about the date formats allowed in the command line
Jose M. Prieto <jmprieto@gmx.net>
parents:
3251
diff
changeset
|
6 abort: invalid date: 'should fail' see hg(1) manual page for details |
2522
85f796baab10
Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff
changeset
|
7 transaction abort! |
85f796baab10
Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff
changeset
|
8 rollback completed |
2524
c1974f65d781
add more testcases for date parsing
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2522
diff
changeset
|
9 abort: date exceeds 32 bits: 100000000000000000 |
c1974f65d781
add more testcases for date parsing
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2522
diff
changeset
|
10 transaction abort! |
c1974f65d781
add more testcases for date parsing
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2522
diff
changeset
|
11 rollback completed |
c1974f65d781
add more testcases for date parsing
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2522
diff
changeset
|
12 abort: impossible time zone offset: 1400000 |
c1974f65d781
add more testcases for date parsing
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2522
diff
changeset
|
13 transaction abort! |
c1974f65d781
add more testcases for date parsing
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2522
diff
changeset
|
14 rollback completed |
3250
e96d2956eb4a
util.strdate: compute timestamp using UTC, not local timezone
Jose M. Prieto <jmprieto@gmx.net>
parents:
2974
diff
changeset
|
15 Sun Jan 15 13:30:00 2006 +0500 |
3251
e5c9a084ffe3
util.strdate: assume local time when no timezone specified
Jose M. Prieto <jmprieto@gmx.net>
parents:
3250
diff
changeset
|
16 Sun Jan 15 13:30:00 2006 -0800 |
3250
e96d2956eb4a
util.strdate: compute timestamp using UTC, not local timezone
Jose M. Prieto <jmprieto@gmx.net>
parents:
2974
diff
changeset
|
17 Sat Jul 15 13:30:00 2006 +0500 |
3251
e5c9a084ffe3
util.strdate: assume local time when no timezone specified
Jose M. Prieto <jmprieto@gmx.net>
parents:
3250
diff
changeset
|
18 Sat Jul 15 13:30:00 2006 -0700 |
2522
85f796baab10
Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff
changeset
|
19 Sun Jun 11 00:26:40 2006 -0400 |
85f796baab10
Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff
changeset
|
20 Sat Apr 15 13:30:00 2006 +0200 |
85f796baab10
Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff
changeset
|
21 Sat Apr 15 13:30:00 2006 +0000 |
85f796baab10
Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff
changeset
|
22 Wed Feb 01 13:00:30 2006 -0500 |
85f796baab10
Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff
changeset
|
23 Wed Feb 01 13:00:30 2006 +0000 |