Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-parse-date.out @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
parents | 30d4d8985dd8 |
children |
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) |
4970
30d4d8985dd8
transactions: avoid late tear-down (issue641)
Matt Mackall <mpm@selenic.com>
parents:
3808
diff
changeset
|
6 transaction abort! |
30d4d8985dd8
transactions: avoid late tear-down (issue641)
Matt Mackall <mpm@selenic.com>
parents:
3808
diff
changeset
|
7 rollback completed |
3808
92a3532a01d9
parsedate: use Abort rather than ValueError
Matt Mackall <mpm@selenic.com>
parents:
3252
diff
changeset
|
8 abort: invalid date: 'should fail' |
2522
85f796baab10
Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff
changeset
|
9 transaction abort! |
85f796baab10
Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff
changeset
|
10 rollback completed |
2524
c1974f65d781
add more testcases for date parsing
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2522
diff
changeset
|
11 abort: date exceeds 32 bits: 100000000000000000 |
c1974f65d781
add more testcases for date parsing
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2522
diff
changeset
|
12 transaction abort! |
c1974f65d781
add more testcases for date parsing
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2522
diff
changeset
|
13 rollback completed |
c1974f65d781
add more testcases for date parsing
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2522
diff
changeset
|
14 abort: impossible time zone offset: 1400000 |
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 |