Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-parse-date.out
author Matt Mackall <mpm@selenic.com>
Wed, 01 Aug 2007 12:33:12 -0500
changeset 5045 f191bc3916f7
parent 3808 92a3532a01d9
child 4970 30d4d8985dd8
permissions -rw-r--r--
merge: do early copy to deal with issue636 Without copies/renames, merges source names are 1:1 with their targets. Copies and renames introduce the possibility that there will be two merges with the same input but different output. By doing the copy to the destination name before the merge, the actual merge becomes 1:1 again, and no source is the input to two different merges. - add a preliminary scan to applyupdates to do copies - for the merge action, pass the old name (for finding ancestors) and the new name (for input to the merge) to filemerge - eliminate the old post-merge copy - lookup file contents from new name in filemerge - pass new name to external merge helper - report merge failure at new name - add a test
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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)
3808
92a3532a01d9 parsedate: use Abort rather than ValueError
Matt Mackall <mpm@selenic.com>
parents: 3252
diff changeset 
     6
 
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 
     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
mercurial-crew-with-dirclash