tests/test-subrepo.t
author Martin Geisler <mg@aragost.com>
Fri, 24 Sep 2010 10:13:49 +0200
changeset 12399 4fee1fd3de9a
parent 12376 97ffc68f71d3
child 12587 e3247ceaca5e
permissions -rw-r--r--
tests: added a short description to issue numbers Many tests already had a short line to describe what IssueXXX is about. I find that quite useful when reading a test.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
     1
  $ rm -rf sub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
     2
  $ mkdir sub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
     3
  $ cd sub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
     4
  $ hg init t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
     5
  $ cd t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
     6
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
     7
first revision, no sub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
     8
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
     9
  $ echo a > a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    10
  $ hg ci -Am0
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    11
  adding a
8816
a7c4eb0cc0ed subrepo: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    12
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    13
add first sub
8816
a7c4eb0cc0ed subrepo: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    14
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    15
  $ echo s = s > .hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    16
  $ hg add .hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    17
  $ hg init s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    18
  $ echo a > s/a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    19
12399
4fee1fd3de9a tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents: 12376
diff changeset
    20
Issue2232: committing a subrepo without .hgsub
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    21
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    22
  $ hg ci -mbad s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    23
  abort: can't commit subrepos without .hgsub
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
    24
  [255]
8816
a7c4eb0cc0ed subrepo: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    25
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    26
  $ hg -R s ci -Ams0
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    27
  adding a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    28
  $ hg sum
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    29
  parent: 0:f7b1eb17ad24 tip
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    30
   0
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    31
  branch: default
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    32
  commit: 1 added, 1 subrepos
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    33
  update: (current)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    34
  $ hg ci -m1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    35
  committing subrepository s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    36
12399
4fee1fd3de9a tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents: 12376
diff changeset
    37
Issue2022: update -C
11485
b602a95c21ec subrepo: refuse to commit subrepos if .hgsub is excluded (issue2232)
Matt Mackall <mpm@selenic.com>
parents: 11470
diff changeset
    38
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    39
  $ echo b > s/a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    40
  $ hg sum
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    41
  parent: 1:7cf8cfea66e4 tip
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    42
   1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    43
  branch: default
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    44
  commit: 1 subrepos
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    45
  update: (current)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    46
  $ hg co -C 1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    47
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    48
  $ hg sum
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    49
  parent: 1:7cf8cfea66e4 tip
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    50
   1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    51
  branch: default
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    52
  commit: (clean)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    53
  update: (current)
11485
b602a95c21ec subrepo: refuse to commit subrepos if .hgsub is excluded (issue2232)
Matt Mackall <mpm@selenic.com>
parents: 11470
diff changeset
    54
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    55
add sub sub
8816
a7c4eb0cc0ed subrepo: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    56
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    57
  $ echo ss = ss > s/.hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    58
  $ hg init s/ss
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    59
  $ echo a > s/ss/a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    60
  $ hg -R s add s/.hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    61
  $ hg -R s/ss add s/ss/a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    62
  $ hg sum
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    63
  parent: 1:7cf8cfea66e4 tip
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    64
   1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    65
  branch: default
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    66
  commit: 1 subrepos
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    67
  update: (current)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    68
  $ hg ci -m2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    69
  committing subrepository s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    70
  committing subrepository s/ss
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    71
  $ hg sum
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    72
  parent: 2:df30734270ae tip
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    73
   2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    74
  branch: default
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    75
  commit: (clean)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    76
  update: (current)
11470
34e33d50c26b subrepo: correctly handle update -C with modified subrepos (issue2022)
Matt Mackall <mpm@selenic.com>
parents: 11088
diff changeset
    77
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    78
bump sub rev
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    79
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    80
  $ echo b > s/a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    81
  $ hg -R s ci -ms1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    82
  $ hg ci -m3
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    83
  committing subrepository s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    84
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    85
leave sub dirty
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    86
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    87
  $ echo c > s/a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    88
  $ hg ci -m4
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    89
  committing subrepository s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    90
  $ hg tip -R s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    91
  changeset:   3:1c833a7a9e3a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    92
  tag:         tip
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    93
  user:        test
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    94
  date:        Thu Jan 01 00:00:00 1970 +0000
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    95
  summary:     4
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    96
  
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    97
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    98
check caching
8816
a7c4eb0cc0ed subrepo: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    99
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   100
  $ hg co 0
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   101
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   102
  $ hg debugsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   103
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   104
restore
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   105
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   106
  $ hg co
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   107
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   108
  $ hg debugsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   109
  path s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   110
   source   s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   111
   revision 1c833a7a9e3a4445c711aaf0f012379cd0d4034e
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   112
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   113
new branch for merge tests
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   114
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   115
  $ hg co 1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   116
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   117
  $ echo t = t >> .hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   118
  $ hg init t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   119
  $ echo t > t/t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   120
  $ hg -R t add t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   121
  adding t/t
8816
a7c4eb0cc0ed subrepo: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   122
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   123
5
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   124
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   125
  $ hg ci -m5 # add sub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   126
  committing subrepository t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   127
  created new head
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   128
  $ echo t2 > t/t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   129
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   130
6
8816
a7c4eb0cc0ed subrepo: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   131
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   132
  $ hg st -R s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   133
  $ hg ci -m6 # change sub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   134
  committing subrepository t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   135
  $ hg debugsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   136
  path s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   137
   source   s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   138
   revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   139
  path t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   140
   source   t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   141
   revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   142
  $ echo t3 > t/t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   143
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   144
7
8816
a7c4eb0cc0ed subrepo: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   145
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   146
  $ hg ci -m7 # change sub again for conflict test
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   147
  committing subrepository t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   148
  $ hg rm .hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   149
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   150
8
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   151
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   152
  $ hg ci -m8 # remove sub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   153
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   154
merge tests
8816
a7c4eb0cc0ed subrepo: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   155
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   156
  $ hg co -C 3
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   157
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   158
  $ hg merge 5 # test adding
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   159
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   160
  (branch merge, don't forget to commit)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   161
  $ hg debugsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   162
  path s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   163
   source   s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   164
   revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   165
  path t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   166
   source   t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   167
   revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   168
  $ hg ci -m9
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   169
  created new head
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   170
  $ hg merge 6 --debug # test change
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   171
    searching for copies back to rev 2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   172
  resolving manifests
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   173
   overwrite None partial False
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   174
   ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   175
   .hgsubstate: versions differ -> m
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   176
  updating: .hgsubstate 1/1 files (100.00%)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   177
  subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   178
    subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   179
  getting subrepo t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   180
  resolving manifests
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   181
   overwrite True partial False
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   182
   ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   183
   t: remote is newer -> g
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   184
  updating: t 1/1 files (100.00%)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   185
  getting t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   186
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   187
  (branch merge, don't forget to commit)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   188
  $ hg debugsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   189
  path s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   190
   source   s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   191
   revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   192
  path t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   193
   source   t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   194
   revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   195
  $ echo conflict > t/t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   196
  $ hg ci -m10
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   197
  committing subrepository t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   198
  $ HGMERGE=internal:merge hg merge --debug 7 # test conflict
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   199
    searching for copies back to rev 2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   200
  resolving manifests
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   201
   overwrite None partial False
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   202
   ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   203
   .hgsubstate: versions differ -> m
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   204
  updating: .hgsubstate 1/1 files (100.00%)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   205
  subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   206
    subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   207
  merging subrepo t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   208
    searching for copies back to rev 2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   209
  resolving manifests
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   210
   overwrite None partial False
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   211
   ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   212
   t: versions differ -> m
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   213
  preserving t for resolve of t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   214
  updating: t 1/1 files (100.00%)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   215
  picked tool 'internal:merge' for t (binary False symlink False)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   216
  merging t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   217
  my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   218
  warning: conflicts during merge.
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   219
  merging t failed!
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   220
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
12314
f2daa6ab514a merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Brodie Rao <brodie@bitheap.org>
parents: 12127
diff changeset
   221
  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   222
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   223
  (branch merge, don't forget to commit)
8816
a7c4eb0cc0ed subrepo: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   224
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   225
should conflict
8816
a7c4eb0cc0ed subrepo: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   226
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   227
  $ cat t/t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   228
  <<<<<<< local
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   229
  conflict
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   230
  =======
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   231
  t3
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   232
  >>>>>>> other
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   233
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   234
clone
8816
a7c4eb0cc0ed subrepo: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   235
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   236
  $ cd ..
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   237
  $ hg clone t tc
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   238
  updating to branch default
12376
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset
   239
  pulling subrepo s from */sub/t/s (glob)
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   240
  requesting all changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   241
  adding changesets
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   242
  adding manifests
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   243
  adding file changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   244
  added 4 changesets with 5 changes to 3 files
12376
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset
   245
  pulling subrepo s/ss from */sub/t/s/ss (glob)
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   246
  requesting all changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   247
  adding changesets
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   248
  adding manifests
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   249
  adding file changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   250
  added 1 changesets with 1 changes to 1 files
12376
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset
   251
  pulling subrepo t from */sub/t/t (glob)
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   252
  requesting all changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   253
  adding changesets
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   254
  adding manifests
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   255
  adding file changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   256
  added 4 changesets with 4 changes to 1 files (+1 heads)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   257
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   258
  $ cd tc
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   259
  $ hg debugsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   260
  path s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   261
   source   s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   262
   revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   263
  path t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   264
   source   t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   265
   revision 20a0db6fbf6c3d2836e6519a642ae929bfc67c0e
8816
a7c4eb0cc0ed subrepo: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   266
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   267
push
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   268
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   269
  $ echo bah > t/t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   270
  $ hg ci -m11
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   271
  committing subrepository t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   272
  $ hg push
12376
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset
   273
  pushing *sub/t (glob)
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset
   274
  pushing *sub/t/s/ss (glob)
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   275
  searching for changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   276
  no changes found
12376
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset
   277
  pushing *sub/t/s (glob)
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   278
  searching for changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   279
  no changes found
12376
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset
   280
  pushing *sub/t/t (glob)
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   281
  searching for changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   282
  adding changesets
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   283
  adding manifests
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   284
  adding file changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   285
  added 1 changesets with 1 changes to 1 files
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   286
  searching for changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   287
  adding changesets
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   288
  adding manifests
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   289
  adding file changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   290
  added 1 changesets with 1 changes to 1 files
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   291
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   292
push -f
10251
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 8816
diff changeset
   293
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   294
  $ echo bah > s/a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   295
  $ hg ci -m12
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   296
  committing subrepository s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   297
  $ hg push
12376
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset
   298
  pushing *sub/t (glob)
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset
   299
  pushing *sub/t/s/ss (glob)
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   300
  searching for changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   301
  no changes found
12376
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset
   302
  pushing *sub/t/s (glob)
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   303
  searching for changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   304
  abort: push creates new remote heads on branch 'default'!
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   305
  (did you forget to merge? use push -f to force)
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
   306
  [255]
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   307
  $ hg push -f
12376
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset
   308
  pushing *sub/t (glob)
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset
   309
  pushing *sub/t/s/ss (glob)
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   310
  searching for changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   311
  no changes found
12376
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset
   312
  pushing *sub/t/s (glob)
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   313
  searching for changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   314
  adding changesets
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   315
  adding manifests
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   316
  adding file changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   317
  added 1 changesets with 1 changes to 1 files (+1 heads)
12376
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset
   318
  pushing *sub/t/t (glob)
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   319
  searching for changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   320
  no changes found
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   321
  searching for changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   322
  adding changesets
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   323
  adding manifests
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   324
  adding file changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   325
  added 1 changesets with 1 changes to 1 files
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   326
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   327
update
10177
5ca0d220ae21 subrepo: add table-based dispatch for subrepo types
Augie Fackler <durin42@gmail.com>
parents: 8816
diff changeset
   328
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   329
  $ cd ../t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   330
  $ hg up -C # discard our earlier merge
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   331
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   332
  $ echo blah > t/t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   333
  $ hg ci -m13
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   334
  committing subrepository t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   335
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   336
pull
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   337
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   338
  $ cd ../tc
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   339
  $ hg pull
12376
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset
   340
  pulling *sub/t (glob)
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   341
  searching for changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   342
  adding changesets
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   343
  adding manifests
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   344
  adding file changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   345
  added 1 changesets with 1 changes to 1 files
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   346
  (run 'hg update' to get a working copy)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   347
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   348
should pull t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   349
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   350
  $ hg up
12376
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset
   351
  pulling subrepo t from */sub/t/t (glob)
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   352
  searching for changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   353
  adding changesets
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   354
  adding manifests
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   355
  adding file changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   356
  added 1 changesets with 1 changes to 1 files
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   357
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   358
  $ cat t/t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   359
  blah
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   360
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   361
bogus subrepo path aborts
10251
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 8816
diff changeset
   362
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   363
  $ echo 'bogus=[boguspath' >> .hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   364
  $ hg ci -m 'bogus subrepo path'
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   365
  abort: missing ] in subrepo source
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
   366
  [255]
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   367
12399
4fee1fd3de9a tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents: 12376
diff changeset
   368
Issue1986: merge aborts when trying to merge a subrepo that
4fee1fd3de9a tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents: 12376
diff changeset
   369
shouldn't need merging
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   370
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   371
# subrepo layout
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   372
#
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   373
#   o   5 br
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   374
#  /|
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   375
# o |   4 default
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   376
# | |
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   377
# | o   3 br
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   378
# |/|
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   379
# o |   2 default
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   380
# | |
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   381
# | o   1 br
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   382
# |/
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   383
# o     0 default
10251
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 8816
diff changeset
   384
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   385
  $ cd ..
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   386
  $ rm -rf sub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   387
  $ hg init main
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   388
  $ cd main
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   389
  $ hg init s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   390
  $ cd s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   391
  $ echo a > a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   392
  $ hg ci -Am1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   393
  adding a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   394
  $ hg branch br
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   395
  marked working directory as branch br
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   396
  $ echo a >> a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   397
  $ hg ci -m1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   398
  $ hg up default
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   399
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   400
  $ echo b > b
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   401
  $ hg ci -Am1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   402
  adding b
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   403
  $ hg up br
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   404
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   405
  $ hg merge tip
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   406
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   407
  (branch merge, don't forget to commit)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   408
  $ hg ci -m1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   409
  $ hg up 2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   410
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   411
  $ echo c > c
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   412
  $ hg ci -Am1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   413
  adding c
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   414
  $ hg up 3
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   415
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   416
  $ hg merge 4
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   417
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   418
  (branch merge, don't forget to commit)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   419
  $ hg ci -m1
10251
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 8816
diff changeset
   420
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   421
# main repo layout:
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   422
#
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   423
#   * <-- try to merge default into br again
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   424
# .`|
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   425
# . o   5 br      --> substate = 5
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   426
# . |
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   427
# o |   4 default --> substate = 4
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   428
# | |
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   429
# | o   3 br      --> substate = 2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   430
# |/|
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   431
# o |   2 default --> substate = 2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   432
# | |
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   433
# | o   1 br      --> substate = 3
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   434
# |/
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   435
# o     0 default --> substate = 2
10378
e1401c74572f subrepo: change default path in hgrc of subrepo after cloning
Saint Germain <saintger@gmail.com>
parents: 10252
diff changeset
   436
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   437
  $ cd ..
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   438
  $ echo 's = s' > .hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   439
  $ hg -R s up 2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   440
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   441
  $ hg ci -Am1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   442
  adding .hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   443
  committing subrepository s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   444
  $ hg branch br
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   445
  marked working directory as branch br
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   446
  $ echo b > b
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   447
  $ hg -R s up 3
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   448
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   449
  $ hg ci -Am1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   450
  adding b
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   451
  committing subrepository s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   452
  $ hg up default
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   453
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   454
  $ echo c > c
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   455
  $ hg ci -Am1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   456
  adding c
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   457
  $ hg up 1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   458
  2 files updated, 0 files merged, 1 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   459
  $ hg merge 2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   460
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   461
  (branch merge, don't forget to commit)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   462
  $ hg ci -m1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   463
  $ hg up 2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   464
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   465
  $ hg -R s up 4
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   466
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   467
  $ echo d > d
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   468
  $ hg ci -Am1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   469
  adding d
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   470
  committing subrepository s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   471
  $ hg up 3
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   472
  2 files updated, 0 files merged, 1 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   473
  $ hg -R s up 5
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   474
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   475
  $ echo e > e
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   476
  $ hg ci -Am1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   477
  adding e
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   478
  committing subrepository s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   479
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   480
  $ hg up 5
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   481
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   482
  $ hg merge 4    # try to merge default into br again
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   483
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   484
  (branch merge, don't forget to commit)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   485
  $ cd ..
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   486
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   487
test subrepo delete from .hgsubstate
10522
b07d487009b2 subrepo: Update .hgsubstate in case of deleted subrepo
Saint Germain <saintger@gmail.com>
parents: 10468
diff changeset
   488
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   489
  $ hg init testdelete
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   490
  $ mkdir testdelete/nested testdelete/nested2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   491
  $ hg init testdelete/nested
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   492
  $ hg init testdelete/nested2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   493
  $ echo test > testdelete/nested/foo
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   494
  $ echo test > testdelete/nested2/foo
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   495
  $ hg -R testdelete/nested add
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   496
  adding testdelete/nested/foo
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   497
  $ hg -R testdelete/nested2 add
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   498
  adding testdelete/nested2/foo
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   499
  $ hg -R testdelete/nested ci -m test
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   500
  $ hg -R testdelete/nested2 ci -m test
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   501
  $ echo nested = nested > testdelete/.hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   502
  $ echo nested2 = nested2 >> testdelete/.hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   503
  $ hg -R testdelete add
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   504
  adding testdelete/.hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   505
  $ hg -R testdelete ci -m "nested 1 & 2 added"
12127
36a65283c3af commit: sort subrepos before committing for stable test output
Martin Geisler <mg@lazybytes.net>
parents: 11912
diff changeset
   506
  committing subrepository nested
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   507
  committing subrepository nested2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   508
  $ echo nested = nested > testdelete/.hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   509
  $ hg -R testdelete ci -m "nested 2 deleted"
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   510
  $ cat testdelete/.hgsubstate
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   511
  bdf5c9a3103743d900b12ae0db3ffdcfd7b0d878 nested
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   512
  $ hg -R testdelete remove testdelete/.hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   513
  $ hg -R testdelete ci -m ".hgsub deleted"
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   514
  $ cat testdelete/.hgsubstate
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   515
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   516
test repository cloning
10251
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 8816
diff changeset
   517
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   518
  $ mkdir mercurial mercurial2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   519
  $ hg init nested_absolute
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   520
  $ echo test > nested_absolute/foo
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   521
  $ hg -R nested_absolute add
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   522
  adding nested_absolute/foo
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   523
  $ hg -R nested_absolute ci -mtest
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   524
  $ cd mercurial
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   525
  $ hg init nested_relative
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   526
  $ echo test2 > nested_relative/foo2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   527
  $ hg -R nested_relative add
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   528
  adding nested_relative/foo2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   529
  $ hg -R nested_relative ci -mtest2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   530
  $ hg init main
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   531
  $ echo "nested_relative = ../nested_relative" > main/.hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   532
  $ echo "nested_absolute = `pwd`/nested_absolute" >> main/.hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   533
  $ hg -R main add
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   534
  adding main/.hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   535
  $ hg -R main ci -m "add subrepos"
12127
36a65283c3af commit: sort subrepos before committing for stable test output
Martin Geisler <mg@lazybytes.net>
parents: 11912
diff changeset
   536
  committing subrepository nested_absolute
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   537
  committing subrepository nested_relative
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   538
  $ cd ..
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   539
  $ hg clone mercurial/main mercurial2/main
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   540
  updating to branch default
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   541
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   542
  $ cat mercurial2/main/nested_absolute/.hg/hgrc \
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   543
  >     mercurial2/main/nested_relative/.hg/hgrc
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   544
  [paths]
12376
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset
   545
  default = */test-subrepo.t/sub/mercurial/nested_absolute (glob)
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   546
  [paths]
12376
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset
   547
  default = */test-subrepo.t/sub/mercurial/nested_relative (glob)
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   548
  $ rm -rf mercurial mercurial2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   549
12399
4fee1fd3de9a tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents: 12376
diff changeset
   550
Issue1977: multirepo push should fail if subrepo push fails
11069
12f04d18143e subrepo: add test for issue1977
Wagner Bruna <wbruna@softwareexpress.com.br>
parents: 10775
diff changeset
   551
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   552
  $ hg init repo
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   553
  $ hg init repo/s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   554
  $ echo a > repo/s/a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   555
  $ hg -R repo/s ci -Am0
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   556
  adding a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   557
  $ echo s = s > repo/.hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   558
  $ hg -R repo ci -Am1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   559
  adding .hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   560
  committing subrepository s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   561
  $ hg clone repo repo2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   562
  updating to branch default
12376
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset
   563
  pulling subrepo s from */sub/repo/s (glob)
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   564
  requesting all changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   565
  adding changesets
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   566
  adding manifests
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   567
  adding file changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   568
  added 1 changesets with 1 changes to 1 files
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   569
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   570
  $ hg -q -R repo2 pull -u
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   571
  $ echo 1 > repo2/s/a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   572
  $ hg -R repo2/s ci -m2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   573
  $ hg -q -R repo2/s push
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   574
  $ hg -R repo2/s up -C 0
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   575
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   576
  $ echo 2 > repo2/s/a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   577
  $ hg -R repo2/s ci -m3
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   578
  created new head
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   579
  $ hg -R repo2 ci -m3
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   580
  committing subrepository s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   581
  $ hg -q -R repo2 push
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   582
  abort: push creates new remote heads on branch 'default'!
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   583
  (did you forget to merge? use push -f to force)
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
   584
  [255]
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   585
  $ hg -R repo update
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   586
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   587
  $ rm -rf repo2 repo