tests/test-flags.t
author pacien <pacien.trangirard@pacien.net>
Thu, 22 Sep 2022 16:09:53 +0200
changeset 49499 4f36738a869a
parent 49252 4141951dacff
permissions -rw-r--r--
tests: fix http-bad-server expected errors for python 3.10 (issue6643) The format of the error message changed with this version of Python. This also removes obsolete Python 3 checks.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
22046
7a9cbb315d84 tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents: 18337
diff changeset
     1
#require execbit
15442
db0340f4b507 tests: use 'hghave execbit' for tests that manipulate x bit in file system
Mads Kiilerich <mads@kiilerich.com>
parents: 14182
diff changeset
     2
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
     3
  $ umask 027
13956
ffb5c09ba822 tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents: 12156
diff changeset
     4
ffb5c09ba822 tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents: 12156
diff changeset
     5
  $ hg init test1
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
     6
  $ cd test1
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
     7
  $ touch a b
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
     8
  $ hg add a b
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
     9
  $ hg ci -m "added a b"
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    10
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    11
  $ cd ..
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    12
  $ hg clone test1 test3
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    13
  updating to branch default
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    14
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
13956
ffb5c09ba822 tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents: 12156
diff changeset
    15
ffb5c09ba822 tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents: 12156
diff changeset
    16
  $ hg init test2
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    17
  $ cd test2
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    18
  $ hg pull ../test1
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    19
  pulling from ../test1
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    20
  requesting all changes
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    21
  adding changesets
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    22
  adding manifests
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    23
  adding file changes
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    24
  added 1 changesets with 2 changes to 2 files
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 22046
diff changeset
    25
  new changesets 22a449e20da5
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    26
  (run 'hg update' to get a working copy)
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    27
  $ hg co
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    28
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    29
  $ chmod +x a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
    30
  $ hg ci -m "chmod +x a"
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    31
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    32
the changelog should mention file a:
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    33
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    34
  $ hg tip --template '{files}\n'
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    35
  a
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    36
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    37
  $ cd ../test1
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    38
  $ echo 123 >>a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
    39
  $ hg ci -m "a updated"
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    40
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    41
  $ hg pull ../test2
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    42
  pulling from ../test2
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    43
  searching for changes
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    44
  adding changesets
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    45
  adding manifests
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    46
  adding file changes
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    47
  added 1 changesets with 0 changes to 0 files (+1 heads)
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 22046
diff changeset
    48
  new changesets 7f4313b42a34
38250
d0abd7949ea3 phases: use "published" in the phase movement message
Boris Feld <boris.feld@octobus.net>
parents: 38249
diff changeset
    49
  1 local changesets published
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    50
  (run 'hg heads' to see heads, 'hg merge' to merge)
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    51
  $ hg heads
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
    52
  changeset:   2:7f4313b42a34
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    53
  tag:         tip
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
    54
  parent:      0:22a449e20da5
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    55
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
    56
  date:        Thu Jan 01 00:00:00 1970 +0000
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    57
  summary:     chmod +x a
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    58
  
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
    59
  changeset:   1:c6ecefc45368
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    60
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
    61
  date:        Thu Jan 01 00:00:00 1970 +0000
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    62
  summary:     a updated
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    63
  
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    64
  $ hg history
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
    65
  changeset:   2:7f4313b42a34
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    66
  tag:         tip
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
    67
  parent:      0:22a449e20da5
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    68
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
    69
  date:        Thu Jan 01 00:00:00 1970 +0000
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    70
  summary:     chmod +x a
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    71
  
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
    72
  changeset:   1:c6ecefc45368
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    73
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
    74
  date:        Thu Jan 01 00:00:00 1970 +0000
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    75
  summary:     a updated
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    76
  
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
    77
  changeset:   0:22a449e20da5
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    78
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
    79
  date:        Thu Jan 01 00:00:00 1970 +0000
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    80
  summary:     added a b
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    81
  
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    82
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    83
  $ hg -v merge
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    84
  resolving manifests
18334
44bda93df90e merge: changing the mode of a file is also an update
Mads Kiilerich <mads@kiilerich.com>
parents: 17132
diff changeset
    85
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    86
  (branch merge, don't forget to commit)
18337
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
    87
  $ cat a
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
    88
  123
557c8522aec0 tests: better test coverage of merges of flags
Mads Kiilerich <mads@kiilerich.com>
parents: 18334
diff changeset
    89
  $ [ -x a ]
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    90
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    91
  $ cd ../test3
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    92
  $ echo 123 >>b
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
    93
  $ hg ci -m "b updated"
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
    94
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    95
  $ hg pull ../test2
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    96
  pulling from ../test2
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    97
  searching for changes
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    98
  adding changesets
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
    99
  adding manifests
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   100
  adding file changes
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   101
  added 1 changesets with 0 changes to 0 files (+1 heads)
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 22046
diff changeset
   102
  new changesets 7f4313b42a34
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   103
  (run 'hg heads' to see heads, 'hg merge' to merge)
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   104
  $ hg heads
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
   105
  changeset:   2:7f4313b42a34
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   106
  tag:         tip
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
   107
  parent:      0:22a449e20da5
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   108
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
   109
  date:        Thu Jan 01 00:00:00 1970 +0000
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   110
  summary:     chmod +x a
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   111
  
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
   112
  changeset:   1:dc57ead75f79
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   113
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
   114
  date:        Thu Jan 01 00:00:00 1970 +0000
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   115
  summary:     b updated
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   116
  
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   117
  $ hg history
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
   118
  changeset:   2:7f4313b42a34
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   119
  tag:         tip
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
   120
  parent:      0:22a449e20da5
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   121
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
   122
  date:        Thu Jan 01 00:00:00 1970 +0000
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   123
  summary:     chmod +x a
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   124
  
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
   125
  changeset:   1:dc57ead75f79
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   126
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
   127
  date:        Thu Jan 01 00:00:00 1970 +0000
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   128
  summary:     b updated
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   129
  
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
   130
  changeset:   0:22a449e20da5
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   131
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11792
diff changeset
   132
  date:        Thu Jan 01 00:00:00 1970 +0000
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   133
  summary:     added a b
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   134
  
3321
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2283
diff changeset
   135
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   136
  $ hg -v merge
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   137
  resolving manifests
18334
44bda93df90e merge: changing the mode of a file is also an update
Mads Kiilerich <mads@kiilerich.com>
parents: 17132
diff changeset
   138
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
11792
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   139
  (branch merge, don't forget to commit)
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   140
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   141
  $ ls -l ../test[123]/a > foo
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   142
  $ cut -b 1-10 < foo
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   143
  -rwxr-x---
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   144
  -rwxr-x---
47d2b4a5bd1e tests: unify test-flags
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 8523
diff changeset
   145
  -rwxr-x---
3321
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2283
diff changeset
   146
14182
ec5886db9dc6 tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents: 13956
diff changeset
   147
  $ hg debugindex a
49252
4141951dacff debugindex: rename the parent column to mention nodeid
Pierre-Yves DAVID <pierre-yves.david@octobus.net>
parents: 49251
diff changeset
   148
     rev linkrev       nodeid    p1-nodeid    p2-nodeid
37283
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
   149
       0       0 b80de5d13875 000000000000 000000000000
14182
ec5886db9dc6 tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents: 13956
diff changeset
   150
  $ hg debugindex -R ../test2 a
49252
4141951dacff debugindex: rename the parent column to mention nodeid
Pierre-Yves DAVID <pierre-yves.david@octobus.net>
parents: 49251
diff changeset
   151
     rev linkrev       nodeid    p1-nodeid    p2-nodeid
37283
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
   152
       0       0 b80de5d13875 000000000000 000000000000
14182
ec5886db9dc6 tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents: 13956
diff changeset
   153
  $ hg debugindex -R ../test1 a
49252
4141951dacff debugindex: rename the parent column to mention nodeid
Pierre-Yves DAVID <pierre-yves.david@octobus.net>
parents: 49251
diff changeset
   154
     rev linkrev       nodeid    p1-nodeid    p2-nodeid
37283
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
   155
       0       0 b80de5d13875 000000000000 000000000000
d4e62df1c73d debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents: 37282
diff changeset
   156
       1       1 7fe919cc0336 b80de5d13875 000000000000
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 15442
diff changeset
   157
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 15442
diff changeset
   158
  $ cd ..