tests/test-subrepo.t
author Adrian Buehlmann <adrian@cadifra.com>
Fri, 03 Jun 2011 12:16:17 +0200
changeset 14525 826a13720fbc
parent 14361 ea7081645987
child 14536 52cbeb5a651b
permissions -rw-r--r--
prepush: print short hash of first new head in abort message and don't mention the branch if it's the default branch. OLD: $ hg push ../a pushing to ../a searching for changes abort: push creates new remote heads on branch 'default'! (you should pull and merge or use push -f to force) NEW: $ hg push ../a pushing to ../a searching for changes abort: push creates new remote head 1e108cc5548c! (you should pull and merge or use push -f to force) This helps to identify which local head is causing troubles. See also change 91cb08a9e7fb.
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
13411
d4de90a612f7 commit: abort if a subrepo is modified and ui.commitsubrepos=no
Patrick Mezard <pmezard@gmail.com>
parents: 13322
diff changeset
    78
bump sub rev (and check it is ignored by ui.commitsubrepos)
11912
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
13411
d4de90a612f7 commit: abort if a subrepo is modified and ui.commitsubrepos=no
Patrick Mezard <pmezard@gmail.com>
parents: 13322
diff changeset
    82
  $ hg --config ui.commitsubrepos=no ci -m3
11912
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
13411
d4de90a612f7 commit: abort if a subrepo is modified and ui.commitsubrepos=no
Patrick Mezard <pmezard@gmail.com>
parents: 13322
diff changeset
    85
leave sub dirty (and check ui.commitsubrepos=no aborts the commit)
11912
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
13411
d4de90a612f7 commit: abort if a subrepo is modified and ui.commitsubrepos=no
Patrick Mezard <pmezard@gmail.com>
parents: 13322
diff changeset
    88
  $ hg --config ui.commitsubrepos=no ci -m4
d4de90a612f7 commit: abort if a subrepo is modified and ui.commitsubrepos=no
Patrick Mezard <pmezard@gmail.com>
parents: 13322
diff changeset
    89
  abort: uncommitted changes in subrepo s
d4de90a612f7 commit: abort if a subrepo is modified and ui.commitsubrepos=no
Patrick Mezard <pmezard@gmail.com>
parents: 13322
diff changeset
    90
  [255]
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    91
  $ hg ci -m4
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    92
  committing subrepository s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    93
  $ hg tip -R s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    94
  changeset:   3:1c833a7a9e3a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    95
  tag:         tip
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    96
  user:        test
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    97
  date:        Thu Jan 01 00:00:00 1970 +0000
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    98
  summary:     4
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
    99
  
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   100
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   101
check caching
8816
a7c4eb0cc0ed subrepo: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   102
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   103
  $ hg co 0
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   104
  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
   105
  $ hg debugsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   106
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   107
restore
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   108
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   109
  $ hg co
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   110
  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
   111
  $ hg debugsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   112
  path s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   113
   source   s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   114
   revision 1c833a7a9e3a4445c711aaf0f012379cd0d4034e
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   115
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   116
new branch for merge tests
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   117
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   118
  $ hg co 1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   119
  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
   120
  $ echo t = t >> .hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   121
  $ hg init t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   122
  $ echo t > t/t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   123
  $ hg -R t add t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   124
  adding t/t
8816
a7c4eb0cc0ed subrepo: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   125
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   126
5
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   127
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   128
  $ hg ci -m5 # add sub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   129
  committing subrepository t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   130
  created new head
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   131
  $ echo t2 > t/t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   132
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   133
6
8816
a7c4eb0cc0ed subrepo: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   134
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   135
  $ hg st -R s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   136
  $ hg ci -m6 # change sub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   137
  committing subrepository t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   138
  $ hg debugsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   139
  path s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   140
   source   s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   141
   revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   142
  path t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   143
   source   t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   144
   revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   145
  $ echo t3 > t/t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   146
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   147
7
8816
a7c4eb0cc0ed subrepo: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   148
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   149
  $ hg ci -m7 # change sub again for conflict test
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   150
  committing subrepository t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   151
  $ hg rm .hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   152
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   153
8
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   154
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   155
  $ hg ci -m8 # remove sub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   156
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   157
merge tests
8816
a7c4eb0cc0ed subrepo: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   158
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   159
  $ hg co -C 3
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   160
  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
   161
  $ hg merge 5 # test adding
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   162
  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
   163
  (branch merge, don't forget to commit)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   164
  $ hg debugsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   165
  path s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   166
   source   s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   167
   revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   168
  path t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   169
   source   t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   170
   revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   171
  $ hg ci -m9
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   172
  created new head
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   173
  $ hg merge 6 --debug # test change
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   174
    searching for copies back to rev 2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   175
  resolving manifests
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   176
   overwrite None partial False
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   177
   ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   178
   .hgsubstate: versions differ -> m
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   179
  updating: .hgsubstate 1/1 files (100.00%)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   180
  subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   181
    subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   182
  getting subrepo t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   183
  resolving manifests
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   184
   overwrite True partial False
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   185
   ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   186
   t: remote is newer -> g
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   187
  updating: t 1/1 files (100.00%)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   188
  getting t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   189
  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
   190
  (branch merge, don't forget to commit)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   191
  $ hg debugsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   192
  path s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   193
   source   s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   194
   revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   195
  path t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   196
   source   t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   197
   revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   198
  $ echo conflict > t/t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   199
  $ hg ci -m10
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   200
  committing subrepository t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   201
  $ HGMERGE=internal:merge hg merge --debug 7 # test conflict
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   202
    searching for copies back to rev 2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   203
  resolving manifests
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   204
   overwrite None partial False
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   205
   ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   206
   .hgsubstate: versions differ -> m
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   207
  updating: .hgsubstate 1/1 files (100.00%)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   208
  subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   209
    subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   210
  merging subrepo t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   211
    searching for copies back to rev 2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   212
  resolving manifests
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   213
   overwrite None partial False
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   214
   ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   215
   t: versions differ -> m
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   216
  preserving t for resolve of t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   217
  updating: t 1/1 files (100.00%)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   218
  picked tool 'internal:merge' for t (binary False symlink False)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   219
  merging t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   220
  my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   221
  warning: conflicts during merge.
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   222
  merging t failed!
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   223
  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
   224
  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
   225
  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
   226
  (branch merge, don't forget to commit)
8816
a7c4eb0cc0ed subrepo: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   227
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   228
should conflict
8816
a7c4eb0cc0ed subrepo: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   229
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   230
  $ cat t/t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   231
  <<<<<<< local
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   232
  conflict
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
  t3
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   235
  >>>>>>> other
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   236
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   237
clone
8816
a7c4eb0cc0ed subrepo: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   238
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   239
  $ cd ..
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   240
  $ hg clone t tc
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   241
  updating to branch default
14281
ccb7240acf32 subrepo: create subrepos using clone instead of pull
Martin Geisler <mg@aragost.com>
parents: 13417
diff changeset
   242
  cloning subrepo s from $TESTTMP/sub/t/s
ccb7240acf32 subrepo: create subrepos using clone instead of pull
Martin Geisler <mg@aragost.com>
parents: 13417
diff changeset
   243
  cloning subrepo s/ss from $TESTTMP/sub/t/s/ss
ccb7240acf32 subrepo: create subrepos using clone instead of pull
Martin Geisler <mg@aragost.com>
parents: 13417
diff changeset
   244
  cloning subrepo t from $TESTTMP/sub/t/t
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   245
  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
   246
  $ cd tc
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   247
  $ hg debugsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   248
  path s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   249
   source   s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   250
   revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   251
  path t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   252
   source   t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   253
   revision 20a0db6fbf6c3d2836e6519a642ae929bfc67c0e
8816
a7c4eb0cc0ed subrepo: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   254
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   255
push
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   256
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   257
  $ echo bah > t/t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   258
  $ hg ci -m11
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   259
  committing subrepository t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   260
  $ hg push
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12587
diff changeset
   261
  pushing to $TESTTMP/sub/t
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12587
diff changeset
   262
  pushing subrepo s/ss to $TESTTMP/sub/t/s/ss
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   263
  searching for changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   264
  no changes found
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12587
diff changeset
   265
  pushing subrepo s to $TESTTMP/sub/t/s
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   266
  searching for changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   267
  no changes found
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12587
diff changeset
   268
  pushing subrepo t to $TESTTMP/sub/t/t
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   269
  searching for changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   270
  adding changesets
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   271
  adding manifests
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   272
  adding file changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   273
  added 1 changesets with 1 changes to 1 files
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   274
  searching for changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   275
  adding changesets
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   276
  adding manifests
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   277
  adding file changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   278
  added 1 changesets with 1 changes to 1 files
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   279
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   280
push -f
10251
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 8816
diff changeset
   281
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   282
  $ echo bah > s/a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   283
  $ hg ci -m12
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   284
  committing subrepository s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   285
  $ hg push
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12587
diff changeset
   286
  pushing to $TESTTMP/sub/t
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12587
diff changeset
   287
  pushing subrepo s/ss to $TESTTMP/sub/t/s/ss
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   288
  searching for changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   289
  no changes found
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12587
diff changeset
   290
  pushing subrepo s to $TESTTMP/sub/t/s
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   291
  searching for changes
14525
826a13720fbc prepush: print short hash of first new head in abort message
Adrian Buehlmann <adrian@cadifra.com>
parents: 14361
diff changeset
   292
  abort: push creates new remote head 12a213df6fa9!
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   293
  (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
   294
  [255]
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   295
  $ hg push -f
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12587
diff changeset
   296
  pushing to $TESTTMP/sub/t
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12587
diff changeset
   297
  pushing subrepo s/ss to $TESTTMP/sub/t/s/ss
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   298
  searching for changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   299
  no changes found
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12587
diff changeset
   300
  pushing subrepo s to $TESTTMP/sub/t/s
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   301
  searching for changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   302
  adding changesets
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   303
  adding manifests
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   304
  adding file changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   305
  added 1 changesets with 1 changes to 1 files (+1 heads)
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12587
diff changeset
   306
  pushing subrepo t to $TESTTMP/sub/t/t
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   307
  searching for changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   308
  no changes found
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   309
  searching for changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   310
  adding changesets
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   311
  adding manifests
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   312
  adding file changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   313
  added 1 changesets with 1 changes to 1 files
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   314
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   315
update
10177
5ca0d220ae21 subrepo: add table-based dispatch for subrepo types
Augie Fackler <durin42@gmail.com>
parents: 8816
diff changeset
   316
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   317
  $ cd ../t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   318
  $ hg up -C # discard our earlier merge
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   319
  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
   320
  $ echo blah > t/t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   321
  $ hg ci -m13
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   322
  committing subrepository t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   323
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   324
pull
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   325
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   326
  $ cd ../tc
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   327
  $ hg pull
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12587
diff changeset
   328
  pulling from $TESTTMP/sub/t
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   329
  searching for changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   330
  adding changesets
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   331
  adding manifests
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   332
  adding file changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   333
  added 1 changesets with 1 changes to 1 files
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   334
  (run 'hg update' to get a working copy)
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
should pull t
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
  $ hg up
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12587
diff changeset
   339
  pulling subrepo t from $TESTTMP/sub/t/t
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   340
  searching for changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   341
  adding changesets
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   342
  adding manifests
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   343
  adding file changes
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   344
  added 1 changesets with 1 changes to 1 files
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   345
  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
   346
  $ cat t/t
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   347
  blah
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   348
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   349
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
   350
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   351
  $ echo 'bogus=[boguspath' >> .hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   352
  $ hg ci -m 'bogus subrepo path'
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   353
  abort: missing ] in subrepo source
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
   354
  [255]
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   355
12399
4fee1fd3de9a tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents: 12376
diff changeset
   356
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
   357
shouldn't need merging
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   358
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   359
# subrepo layout
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
#   o   5 br
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   362
#  /|
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   363
# o |   4 default
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   364
# | |
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   365
# | o   3 br
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   366
# |/|
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   367
# o |   2 default
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   368
# | |
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   369
# | o   1 br
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
# o     0 default
10251
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 8816
diff changeset
   372
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   373
  $ cd ..
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   374
  $ rm -rf sub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   375
  $ hg init main
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   376
  $ cd main
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   377
  $ hg init s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   378
  $ cd s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   379
  $ echo a > a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   380
  $ hg ci -Am1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   381
  adding a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   382
  $ hg branch br
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   383
  marked working directory as branch br
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   384
  $ echo a >> a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   385
  $ hg ci -m1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   386
  $ hg up default
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   387
  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
   388
  $ echo b > b
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   389
  $ hg ci -Am1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   390
  adding b
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   391
  $ hg up br
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   392
  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
   393
  $ hg merge tip
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   394
  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
   395
  (branch merge, don't forget to commit)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   396
  $ hg ci -m1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   397
  $ hg up 2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   398
  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
   399
  $ echo c > c
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   400
  $ hg ci -Am1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   401
  adding c
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   402
  $ hg up 3
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   403
  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
   404
  $ hg merge 4
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   405
  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
   406
  (branch merge, don't forget to commit)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   407
  $ hg ci -m1
10251
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 8816
diff changeset
   408
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   409
# main repo layout:
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   410
#
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   411
#   * <-- try to merge default into br again
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   412
# .`|
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   413
# . o   5 br      --> substate = 5
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   414
# . |
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   415
# o |   4 default --> substate = 4
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   416
# | |
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   417
# | o   3 br      --> substate = 2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   418
# |/|
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   419
# o |   2 default --> substate = 2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   420
# | |
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   421
# | o   1 br      --> substate = 3
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
# 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
   424
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   425
  $ cd ..
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   426
  $ echo 's = s' > .hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   427
  $ hg -R s up 2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   428
  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
   429
  $ hg ci -Am1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   430
  adding .hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   431
  committing subrepository s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   432
  $ hg branch br
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   433
  marked working directory as branch br
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   434
  $ echo b > b
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   435
  $ hg -R s up 3
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   436
  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
   437
  $ hg ci -Am1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   438
  adding b
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   439
  committing subrepository s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   440
  $ hg up default
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   441
  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
   442
  $ echo c > c
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   443
  $ hg ci -Am1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   444
  adding c
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   445
  $ hg up 1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   446
  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
   447
  $ hg merge 2
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
  (branch merge, don't forget to commit)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   450
  $ hg ci -m1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   451
  $ hg up 2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   452
  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
   453
  $ hg -R s up 4
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   454
  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
   455
  $ echo d > d
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   456
  $ hg ci -Am1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   457
  adding d
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   458
  committing subrepository s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   459
  $ hg up 3
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   460
  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
   461
  $ hg -R s up 5
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   462
  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
   463
  $ echo e > e
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   464
  $ hg ci -Am1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   465
  adding e
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   466
  committing subrepository s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   467
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   468
  $ hg up 5
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   469
  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
   470
  $ hg merge 4    # try to merge default into br again
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   471
  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
   472
  (branch merge, don't forget to commit)
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   473
  $ cd ..
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   474
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   475
test subrepo delete from .hgsubstate
10522
b07d487009b2 subrepo: Update .hgsubstate in case of deleted subrepo
Saint Germain <saintger@gmail.com>
parents: 10468
diff changeset
   476
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   477
  $ hg init testdelete
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   478
  $ mkdir testdelete/nested testdelete/nested2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   479
  $ hg init testdelete/nested
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   480
  $ hg init testdelete/nested2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   481
  $ echo test > testdelete/nested/foo
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   482
  $ echo test > testdelete/nested2/foo
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   483
  $ hg -R testdelete/nested add
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   484
  adding testdelete/nested/foo
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   485
  $ hg -R testdelete/nested2 add
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   486
  adding testdelete/nested2/foo
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   487
  $ hg -R testdelete/nested ci -m test
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   488
  $ hg -R testdelete/nested2 ci -m test
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   489
  $ echo nested = nested > testdelete/.hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   490
  $ echo nested2 = nested2 >> testdelete/.hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   491
  $ hg -R testdelete add
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   492
  adding testdelete/.hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   493
  $ 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
   494
  committing subrepository nested
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   495
  committing subrepository nested2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   496
  $ echo nested = nested > testdelete/.hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   497
  $ hg -R testdelete ci -m "nested 2 deleted"
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   498
  $ cat testdelete/.hgsubstate
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   499
  bdf5c9a3103743d900b12ae0db3ffdcfd7b0d878 nested
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   500
  $ hg -R testdelete remove testdelete/.hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   501
  $ hg -R testdelete ci -m ".hgsub deleted"
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   502
  $ cat testdelete/.hgsubstate
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   503
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   504
test repository cloning
10251
a19d2993385d subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 8816
diff changeset
   505
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   506
  $ mkdir mercurial mercurial2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   507
  $ hg init nested_absolute
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   508
  $ echo test > nested_absolute/foo
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   509
  $ hg -R nested_absolute add
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   510
  adding nested_absolute/foo
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   511
  $ hg -R nested_absolute ci -mtest
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   512
  $ cd mercurial
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   513
  $ hg init nested_relative
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   514
  $ echo test2 > nested_relative/foo2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   515
  $ hg -R nested_relative add
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   516
  adding nested_relative/foo2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   517
  $ hg -R nested_relative ci -mtest2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   518
  $ hg init main
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   519
  $ echo "nested_relative = ../nested_relative" > main/.hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   520
  $ echo "nested_absolute = `pwd`/nested_absolute" >> main/.hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   521
  $ hg -R main add
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   522
  adding main/.hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   523
  $ 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
   524
  committing subrepository nested_absolute
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   525
  committing subrepository nested_relative
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   526
  $ cd ..
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   527
  $ hg clone mercurial/main mercurial2/main
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   528
  updating to branch default
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   529
  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
   530
  $ cat mercurial2/main/nested_absolute/.hg/hgrc \
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   531
  >     mercurial2/main/nested_relative/.hg/hgrc
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   532
  [paths]
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12587
diff changeset
   533
  default = $TESTTMP/sub/mercurial/nested_absolute
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   534
  [paths]
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12587
diff changeset
   535
  default = $TESTTMP/sub/mercurial/nested_relative
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   536
  $ rm -rf mercurial mercurial2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   537
12399
4fee1fd3de9a tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents: 12376
diff changeset
   538
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
   539
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   540
  $ hg init repo
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   541
  $ hg init repo/s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   542
  $ echo a > repo/s/a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   543
  $ hg -R repo/s ci -Am0
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   544
  adding a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   545
  $ echo s = s > repo/.hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   546
  $ hg -R repo ci -Am1
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   547
  adding .hgsub
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   548
  committing subrepository s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   549
  $ hg clone repo repo2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   550
  updating to branch default
14281
ccb7240acf32 subrepo: create subrepos using clone instead of pull
Martin Geisler <mg@aragost.com>
parents: 13417
diff changeset
   551
  cloning subrepo s from $TESTTMP/sub/repo/s
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   552
  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
   553
  $ hg -q -R repo2 pull -u
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   554
  $ echo 1 > repo2/s/a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   555
  $ hg -R repo2/s ci -m2
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   556
  $ hg -q -R repo2/s push
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   557
  $ hg -R repo2/s up -C 0
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   558
  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
   559
  $ echo 2 > repo2/s/a
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   560
  $ hg -R repo2/s ci -m3
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   561
  created new head
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   562
  $ hg -R repo2 ci -m3
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   563
  committing subrepository s
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   564
  $ hg -q -R repo2 push
14525
826a13720fbc prepush: print short hash of first new head in abort message
Adrian Buehlmann <adrian@cadifra.com>
parents: 14361
diff changeset
   565
  abort: push creates new remote head 9d66565e64e1!
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   566
  (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
   567
  [255]
11912
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   568
  $ hg -R repo update
69678985bdba tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents: 11485
diff changeset
   569
  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
   570
  $ rm -rf repo2 repo
12753
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   571
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   572
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   573
Issue1852 subrepos with relative paths always push/pull relative to default
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   574
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   575
Prepare a repo with subrepo
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   576
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   577
  $ hg init issue1852a
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   578
  $ cd issue1852a
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   579
  $ hg init sub/repo
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   580
  $ echo test > sub/repo/foo
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   581
  $ hg -R sub/repo add sub/repo/foo
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   582
  $ echo sub/repo = sub/repo > .hgsub
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   583
  $ hg add .hgsub
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   584
  $ hg ci -mtest
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   585
  committing subrepository sub/repo
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   586
  $ echo test >> sub/repo/foo
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   587
  $ hg ci -mtest
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   588
  committing subrepository sub/repo
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   589
  $ cd ..
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   590
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   591
Create repo without default path, pull top repo, and see what happens on update
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   592
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   593
  $ hg init issue1852b
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   594
  $ hg -R issue1852b pull issue1852a
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   595
  pulling from issue1852a
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   596
  requesting all changes
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   597
  adding changesets
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   598
  adding manifests
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   599
  adding file changes
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   600
  added 2 changesets with 3 changes to 2 files
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   601
  (run 'hg update' to get a working copy)
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   602
  $ hg -R issue1852b update
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   603
  abort: default path for subrepository sub/repo not found
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   604
  [255]
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   605
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   606
Pull -u now doesn't help
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   607
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   608
  $ hg -R issue1852b pull -u issue1852a
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   609
  pulling from issue1852a
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   610
  searching for changes
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   611
  no changes found
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   612
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   613
Try the same, but with pull -u
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   614
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   615
  $ hg init issue1852c
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   616
  $ hg -R issue1852c pull -r0 -u issue1852a
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   617
  pulling from issue1852a
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   618
  adding changesets
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   619
  adding manifests
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   620
  adding file changes
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   621
  added 1 changesets with 2 changes to 2 files
14281
ccb7240acf32 subrepo: create subrepos using clone instead of pull
Martin Geisler <mg@aragost.com>
parents: 13417
diff changeset
   622
  cloning subrepo sub/repo from issue1852a/sub/repo
12852
5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents: 12847
diff changeset
   623
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
12753
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   624
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   625
Try to push from the other side
ef5eaf53f4f7 subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
   626
12852
5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents: 12847
diff changeset
   627
  $ hg -R issue1852a push `pwd`/issue1852c
5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents: 12847
diff changeset
   628
  pushing to $TESTTMP/sub/issue1852c
5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents: 12847
diff changeset
   629
  pushing subrepo sub/repo to $TESTTMP/sub/issue1852c/sub/repo
5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents: 12847
diff changeset
   630
  searching for changes
5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents: 12847
diff changeset
   631
  no changes found
5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents: 12847
diff changeset
   632
  searching for changes
5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents: 12847
diff changeset
   633
  adding changesets
5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents: 12847
diff changeset
   634
  adding manifests
5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents: 12847
diff changeset
   635
  adding file changes
5dbff89cf107 subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents: 12847
diff changeset
   636
  added 1 changesets with 1 changes to 1 files
13233
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents: 12852
diff changeset
   637
14360
ab687820c4cc subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents: 13417
diff changeset
   638
Incoming and outgoing should not use the default path:
ab687820c4cc subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents: 13417
diff changeset
   639
ab687820c4cc subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents: 13417
diff changeset
   640
  $ hg clone -q issue1852a issue1852d
ab687820c4cc subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents: 13417
diff changeset
   641
  $ hg -R issue1852d outgoing --subrepos issue1852c
ab687820c4cc subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents: 13417
diff changeset
   642
  comparing with issue1852c
ab687820c4cc subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents: 13417
diff changeset
   643
  searching for changes
ab687820c4cc subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents: 13417
diff changeset
   644
  no changes found
ab687820c4cc subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents: 13417
diff changeset
   645
  comparing with issue1852c/sub/repo
ab687820c4cc subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents: 13417
diff changeset
   646
  searching for changes
ab687820c4cc subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents: 13417
diff changeset
   647
  no changes found
ab687820c4cc subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents: 13417
diff changeset
   648
  [1]
ab687820c4cc subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents: 13417
diff changeset
   649
  $ hg -R issue1852d incoming --subrepos issue1852c
ab687820c4cc subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents: 13417
diff changeset
   650
  comparing with issue1852c
ab687820c4cc subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents: 13417
diff changeset
   651
  searching for changes
ab687820c4cc subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents: 13417
diff changeset
   652
  no changes found
ab687820c4cc subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents: 13417
diff changeset
   653
  comparing with issue1852c/sub/repo
ab687820c4cc subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents: 13417
diff changeset
   654
  searching for changes
ab687820c4cc subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents: 13417
diff changeset
   655
  no changes found
ab687820c4cc subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents: 13417
diff changeset
   656
  [1]
ab687820c4cc subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents: 13417
diff changeset
   657
13233
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents: 12852
diff changeset
   658
Check status of files when none of them belong to the first
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents: 12852
diff changeset
   659
subrepository:
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents: 12852
diff changeset
   660
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents: 12852
diff changeset
   661
  $ hg init subrepo-status
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents: 12852
diff changeset
   662
  $ cd subrepo-status
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents: 12852
diff changeset
   663
  $ hg init subrepo-1
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents: 12852
diff changeset
   664
  $ hg init subrepo-2
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents: 12852
diff changeset
   665
  $ cd subrepo-2
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents: 12852
diff changeset
   666
  $ touch file
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents: 12852
diff changeset
   667
  $ hg add file
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents: 12852
diff changeset
   668
  $ cd ..
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents: 12852
diff changeset
   669
  $ echo subrepo-1 = subrepo-1 > .hgsub
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents: 12852
diff changeset
   670
  $ echo subrepo-2 = subrepo-2 >> .hgsub
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents: 12852
diff changeset
   671
  $ hg add .hgsub
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents: 12852
diff changeset
   672
  $ hg ci -m 'Added subrepos'
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents: 12852
diff changeset
   673
  committing subrepository subrepo-1
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents: 12852
diff changeset
   674
  committing subrepository subrepo-2
0b30e6148ec5 subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents: 12852
diff changeset
   675
  $ hg st subrepo-2/file
13322
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   676
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   677
Check hg update --clean
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   678
  $ cd $TESTTMP/sub/t
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   679
  $ rm -r t/t.orig
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   680
  $ hg status -S --all
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   681
  C .hgsub
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   682
  C .hgsubstate
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   683
  C a
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   684
  C s/.hgsub
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   685
  C s/.hgsubstate
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   686
  C s/a
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   687
  C s/ss/a
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   688
  C t/t
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   689
  $ echo c1 > s/a
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   690
  $ cd s
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   691
  $ echo c1 > b
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   692
  $ echo c1 > c
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   693
  $ hg add b
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   694
  $ cd ..
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   695
  $ hg status -S
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   696
  M s/a
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   697
  A s/b
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   698
  ? s/c
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   699
  $ hg update -C
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   700
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   701
  $ hg status -S
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   702
  ? s/b
c19b9282d3a7 subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents: 13233
diff changeset
   703
  ? s/c
13417
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   704
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   705
Sticky subrepositories, no changes
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   706
  $ cd $TESTTMP/sub/t
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   707
  $ hg id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   708
  925c17564ef8 tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   709
  $ hg -R s id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   710
  12a213df6fa9 tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   711
  $ hg -R t id  
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   712
  52c0adc0515a tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   713
  $ hg update 11
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   714
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   715
  $ hg id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   716
  365661e5936a
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   717
  $ hg -R s id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   718
  fc627a69481f
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   719
  $ hg -R t id  
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   720
  e95bcfa18a35
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   721
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   722
Sticky subrepositorys, file changes
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   723
  $ touch s/f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   724
  $ touch t/f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   725
  $ hg add -S s/f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   726
  $ hg add -S t/f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   727
  $ hg id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   728
  365661e5936a
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   729
  $ hg -R s id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   730
  fc627a69481f+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   731
  $ hg -R t id  
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   732
  e95bcfa18a35+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   733
  $ hg update tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   734
   subrepository sources for s differ
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   735
  use (l)ocal source (fc627a69481f) or (r)emote source (12a213df6fa9)?
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   736
   l
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   737
   subrepository sources for t differ
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   738
  use (l)ocal source (e95bcfa18a35) or (r)emote source (52c0adc0515a)?
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   739
   l
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   740
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   741
  $ hg id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   742
  925c17564ef8+ tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   743
  $ hg -R s id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   744
  fc627a69481f+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   745
  $ hg -R t id  
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   746
  e95bcfa18a35+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   747
  $ hg update --clean tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   748
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   749
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   750
Sticky subrepository, revision updates
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   751
  $ hg id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   752
  925c17564ef8 tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   753
  $ hg -R s id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   754
  12a213df6fa9 tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   755
  $ hg -R t id  
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   756
  52c0adc0515a tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   757
  $ cd s
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   758
  $ hg update -r -2
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   759
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   760
  $ cd ../t
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   761
  $ hg update -r 2
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   762
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   763
  $ cd ..
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   764
  $ hg update 10
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   765
   subrepository sources for t differ (in checked out version)
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   766
  use (l)ocal source (7af322bc1198) or (r)emote source (20a0db6fbf6c)?
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   767
   l
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   768
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   769
  $ hg id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   770
  e45c8b14af55+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   771
  $ hg -R s id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   772
  1c833a7a9e3a
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   773
  $ hg -R t id  
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   774
  7af322bc1198
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   775
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   776
Sticky subrepository, file changes and revision updates
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   777
  $ touch s/f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   778
  $ touch t/f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   779
  $ hg add -S s/f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   780
  $ hg add -S t/f1
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   781
  $ hg id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   782
  e45c8b14af55+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   783
  $ hg -R s id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   784
  1c833a7a9e3a+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   785
  $ hg -R t id  
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   786
  7af322bc1198+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   787
  $ hg update tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   788
   subrepository sources for s differ
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   789
  use (l)ocal source (1c833a7a9e3a) or (r)emote source (12a213df6fa9)?
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   790
   l
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   791
   subrepository sources for t differ
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   792
  use (l)ocal source (7af322bc1198) or (r)emote source (52c0adc0515a)?
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   793
   l
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   794
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   795
  $ hg id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   796
  925c17564ef8 tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   797
  $ hg -R s id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   798
  1c833a7a9e3a+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   799
  $ hg -R t id  
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   800
  7af322bc1198+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   801
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   802
Sticky repository, update --clean
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   803
  $ hg update --clean tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   804
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   805
  $ hg id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   806
  925c17564ef8 tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   807
  $ hg -R s id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   808
  12a213df6fa9 tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   809
  $ hg -R t id  
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   810
  52c0adc0515a tip
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   811
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   812
Test subrepo already at intended revision:
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   813
  $ cd s
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   814
  $ hg update fc627a69481f
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   815
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   816
  $ cd ..
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   817
  $ hg update 11
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   818
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   819
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   820
  $ hg id -n
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   821
  11+
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   822
  $ hg -R s id
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   823
  fc627a69481f
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   824
  $ hg -R t id 
0748e18be470 subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents: 13411
diff changeset
   825
  e95bcfa18a35