Mercurial Mercurial > mercurial / 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-update-reverse.out
author Martin Geisler <mg@lazybytes.net>
Thu, 02 Sep 2010 23:22:51 +0200
changeset 12156 4c94b6d0fb1c
parent 11716 db426935fa94
permissions -rw-r--r--
tests: remove unneeded -d flags Many tests fixed the commit date of their changesets at '1000000 0' or similar. However testing with "Mon Jan 12 13:46:40 1970 +0000" is not better than testing with "Thu Jan 01 00:00:00 1970 +0000", which is the default run-tests.py installs. Removing the unnecessary flag removes some clutter and will hopefully make it clearer what the tests are really trying to test. Some tests did not even change their output when the dates were changed, in which case the -d flag was truly irrelevant. Dates used in sequence (such as '0 0', '1 0', etc...) were left alone since they may make the test easier to understand.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1933
diff changeset 
     1
 
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset 
     2
 
Main should be gone
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset 
     3
 
a
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 3314
diff changeset 
     4
 
created new head
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11716
diff changeset 
     5
 
changeset:   3:91ebc10ed028
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset 
     6
 
tag:         tip
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset 
     7
 
user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11716
diff changeset 
     8
 
date:        Thu Jan 01 00:00:00 1970 +0000
1236
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset 
     9
 
summary:     Added side2
67a28636ea64 Fix bug with co -C across branches, update tests
mpm@selenic.com
parents:
diff changeset 
    10
 







12156






4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
11716

diff
changeset




    11


changeset:   2:b932d7dbb1e1












4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
11716

diff
changeset




    12


parent:      0:c2eda428b523







1236






67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    13


user:        test







12156






4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
11716

diff
changeset




    14


date:        Thu Jan 01 00:00:00 1970 +0000







1236






67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    15


summary:     Added side1












67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    16









12156






4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
11716

diff
changeset




    17


changeset:   1:71a760306caf







1236






67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    18


user:        test







12156






4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
11716

diff
changeset




    19


date:        Thu Jan 01 00:00:00 1970 +0000







1236






67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    20


summary:     Added main












67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    21









12156






4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
11716

diff
changeset




    22


changeset:   0:c2eda428b523







1236






67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    23


user:        test







12156






4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
11716

diff
changeset




    24


date:        Thu Jan 01 00:00:00 1970 +0000







1236






67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    25


summary:     Added a












67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    26














67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    27


Should have two heads, side2 and main







12156






4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
11716

diff
changeset




    28


changeset:   3:91ebc10ed028







1236






67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    29


tag:         tip












67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    30


user:        test







12156






4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
11716

diff
changeset




    31


date:        Thu Jan 01 00:00:00 1970 +0000







1236






67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    32


summary:     Added side2












67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    33









12156






4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
11716

diff
changeset




    34


changeset:   1:71a760306caf







1236






67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    35


user:        test







12156






4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
11716

diff
changeset




    36


date:        Thu Jan 01 00:00:00 1970 +0000







1236






67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    37


summary:     Added main












67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    38














67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    39


Should show a side1 side2












67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    40


a












67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    41


side1












67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    42


side2












67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    43


resolving manifests







3314






b16456909a0a
merge: various tidying



Matt Mackall <mpm@selenic.com>


parents: 
3121

diff
changeset




    44


 overwrite True partial False







12156






4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
11716

diff
changeset




    45


 ancestor 91ebc10ed028+ local 91ebc10ed028+ remote 71a760306caf







8734






60fa3371aa75
merge: pretend ancestor is local to simplify backwards and overwrite



Matt Mackall <mpm@selenic.com>


parents: 
6805

diff
changeset




    46


 side2: other deleted -> r












60fa3371aa75
merge: pretend ancestor is local to simplify backwards and overwrite



Matt Mackall <mpm@selenic.com>


parents: 
6805

diff
changeset




    47


 side1: other deleted -> r







3121






2ef0b3aae186
merge: simplify actions with helper function



Matt Mackall <mpm@selenic.com>


parents: 
3110

diff
changeset




    48


 main: remote created -> g







11716






db426935fa94
progress: use gerund (updating) for merge progress



timeless <timeless@gmail.com>


parents: 
10431

diff
changeset




    49


updating: side1 1/3 files (33.33%)







1236






67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    50


removing side1







11716






db426935fa94
progress: use gerund (updating) for merge progress



timeless <timeless@gmail.com>


parents: 
10431

diff
changeset




    51


updating: side2 2/3 files (66.67%)







1236






67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    52


removing side2







11716






db426935fa94
progress: use gerund (updating) for merge progress



timeless <timeless@gmail.com>


parents: 
10431

diff
changeset




    53


updating: main 3/3 files (100.00%)







6805






482581431dcd
Sort removes first when applying updates (fixes issues 750 and 912)



Paul Moore <p.f.moore@gmail.com>


parents: 
6336

diff
changeset




    54


getting main







1922






6d50d6189269
ui: output the number of file updated/merged/removed/... on update



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
1443

diff
changeset




    55


1 files updated, 0 files merged, 2 files removed, 0 files unresolved







1236






67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    56


Should only show a main












67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    57


a












67a28636ea64
Fix bug with co -C across branches, update tests



mpm@selenic.com


parents: 

diff
changeset




    58


main














mercurial