tests/test-flags.out
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
Tue, 18 Dec 2007 14:11:13 -0600
changeset 5664 da72b4d24797
parent 4531 b51a8138292a
child 6338 0750f11152fe
permissions -rw-r--r--
Fix income/pull with bundle and -R (issue 820). Uses ui.setconfig() to tell bundlerepo where the main repo is. This is needed for when the --repository option is used. Adds tests to test-bundle and a new test script test-mq-pull-from-bundle, which plays out the situation that initially made me detect this bug (hg -R .hg/patches pull ../bundle.hg).
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3321
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
     1
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
     2
pulling from ../test1
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
     3
requesting all changes
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
     4
adding changesets
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
     5
adding manifests
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 749
diff changeset
     6
adding file changes
122449dd89db Fix up test results
mpm@selenic.com
parents: 749
diff changeset
     7
added 1 changesets with 2 changes to 2 files
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
     8
(run 'hg update' to get a working copy)
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset
     9
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
4530
0ac7fee4f024 Make sure the changelog mentions files whose flags changed
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3323
diff changeset
    10
% the changelog should mention file a:
0ac7fee4f024 Make sure the changelog mentions files whose flags changed
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3323
diff changeset
    11
a
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    12
pulling from ../test2
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    13
searching for changes
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    14
adding changesets
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    15
adding manifests
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 749
diff changeset
    16
adding file changes
4531
b51a8138292a Avoid extra filelogs entries.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4530
diff changeset
    17
added 1 changesets with 0 changes to 0 files (+1 heads)
2019
ced2d3620f95 add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset
    18
(run 'hg heads' to see heads, 'hg merge' to merge)
4531
b51a8138292a Avoid extra filelogs entries.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4530
diff changeset
    19
changeset:   2:37dccb76c058
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    20
tag:         tip
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1922
diff changeset
    21
parent:      0:4536b1c2ca69
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    22
user:        test
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1922
diff changeset
    23
date:        Mon Jan 12 13:46:40 1970 +0000
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    24
summary:     chmod +x a
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    25
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1922
diff changeset
    26
changeset:   1:a187cb361a5a
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    27
user:        test
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1922
diff changeset
    28
date:        Mon Jan 12 13:46:40 1970 +0000
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    29
summary:     a updated
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    30
4531
b51a8138292a Avoid extra filelogs entries.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4530
diff changeset
    31
changeset:   2:37dccb76c058
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    32
tag:         tip
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1922
diff changeset
    33
parent:      0:4536b1c2ca69
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    34
user:        test
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1922
diff changeset
    35
date:        Mon Jan 12 13:46:40 1970 +0000
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    36
summary:     chmod +x a
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    37
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1922
diff changeset
    38
changeset:   1:a187cb361a5a
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    39
user:        test
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1922
diff changeset
    40
date:        Mon Jan 12 13:46:40 1970 +0000
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    41
summary:     a updated
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    42
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1922
diff changeset
    43
changeset:   0:4536b1c2ca69
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    44
user:        test
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1922
diff changeset
    45
date:        Mon Jan 12 13:46:40 1970 +0000
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    46
summary:     added a b
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    47
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    48
resolving manifests
4531
b51a8138292a Avoid extra filelogs entries.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4530
diff changeset
    49
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1922
6d50d6189269 ui: output the number of file updated/merged/removed/... on update
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1043
diff changeset
    50
(branch merge, don't forget to commit)
3321
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    51
pulling from ../test2
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    52
searching for changes
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    53
adding changesets
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    54
adding manifests
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    55
adding file changes
4531
b51a8138292a Avoid extra filelogs entries.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4530
diff changeset
    56
added 1 changesets with 0 changes to 0 files (+1 heads)
3321
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    57
(run 'hg heads' to see heads, 'hg merge' to merge)
4531
b51a8138292a Avoid extra filelogs entries.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4530
diff changeset
    58
changeset:   2:37dccb76c058
3321
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    59
tag:         tip
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    60
parent:      0:4536b1c2ca69
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    61
user:        test
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    62
date:        Mon Jan 12 13:46:40 1970 +0000
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    63
summary:     chmod +x a
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    64
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    65
changeset:   1:d54568174d8e
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    66
user:        test
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    67
date:        Mon Jan 12 13:46:40 1970 +0000
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    68
summary:     b updated
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    69
4531
b51a8138292a Avoid extra filelogs entries.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4530
diff changeset
    70
changeset:   2:37dccb76c058
3321
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    71
tag:         tip
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    72
parent:      0:4536b1c2ca69
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    73
user:        test
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    74
date:        Mon Jan 12 13:46:40 1970 +0000
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    75
summary:     chmod +x a
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    76
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    77
changeset:   1:d54568174d8e
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    78
user:        test
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    79
date:        Mon Jan 12 13:46:40 1970 +0000
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    80
summary:     b updated
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    81
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    82
changeset:   0:4536b1c2ca69
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    83
user:        test
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    84
date:        Mon Jan 12 13:46:40 1970 +0000
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    85
summary:     added a b
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    86
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    87
resolving manifests
4531
b51a8138292a Avoid extra filelogs entries.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4530
diff changeset
    88
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
3321
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    89
(branch merge, don't forget to commit)
491
66eb9905d0a2 Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 414
diff changeset
    90
-rwxr-x---
66eb9905d0a2 Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 414
diff changeset
    91
-rwxr-x---
3321
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    92
-rwxr-x---
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    93
   rev    offset  length   base linkrev nodeid       p1           p2
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    94
     0         0       0      0       0 b80de5d13875 000000000000 000000000000
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    95
   rev    offset  length   base linkrev nodeid       p1           p2
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    96
     0         0       0      0       0 b80de5d13875 000000000000 000000000000
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    97
   rev    offset  length   base linkrev nodeid       p1           p2
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    98
     0         0       0      0       0 b80de5d13875 000000000000 000000000000
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
    99
     1         0       5      1       1 7fe919cc0336 b80de5d13875 000000000000