Mercurial > hg
annotate tests/test-subrepo.out @ 11873:0a0b2872b0de
tests: unify test-bundle-vs-outgoing
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Sat, 14 Aug 2010 03:26:03 +0200 |
| parents | a286a4ecbfeb |
| children |
| rev | line source |
|---|---|
| 8816 | 1 % first revision, no sub |
| 2 adding a | |
| 3 % add first sub | |
|
11485
b602a95c21ec
subrepo: refuse to commit subrepos if .hgsub is excluded (issue2232)
Matt Mackall <mpm@selenic.com>
parents:
11470
diff
changeset
|
4 abort: can't commit subrepos without .hgsub |
| 8816 | 5 adding a |
|
11088
c4347e48b0d0
summary: add subrepo status
Matt Mackall <mpm@selenic.com>
parents:
11086
diff
changeset
|
6 parent: 0:f7b1eb17ad24 tip |
|
c4347e48b0d0
summary: add subrepo status
Matt Mackall <mpm@selenic.com>
parents:
11086
diff
changeset
|
7 0 |
|
c4347e48b0d0
summary: add subrepo status
Matt Mackall <mpm@selenic.com>
parents:
11086
diff
changeset
|
8 branch: default |
|
c4347e48b0d0
summary: add subrepo status
Matt Mackall <mpm@selenic.com>
parents:
11086
diff
changeset
|
9 commit: 1 added, 1 subrepos |
|
c4347e48b0d0
summary: add subrepo status
Matt Mackall <mpm@selenic.com>
parents:
11086
diff
changeset
|
10 update: (current) |
| 8816 | 11 committing subrepository s |
|
11470
34e33d50c26b
subrepo: correctly handle update -C with modified subrepos (issue2022)
Matt Mackall <mpm@selenic.com>
parents:
11317
diff
changeset
|
12 parent: 1:7cf8cfea66e4 tip |
|
34e33d50c26b
subrepo: correctly handle update -C with modified subrepos (issue2022)
Matt Mackall <mpm@selenic.com>
parents:
11317
diff
changeset
|
13 1 |
|
34e33d50c26b
subrepo: correctly handle update -C with modified subrepos (issue2022)
Matt Mackall <mpm@selenic.com>
parents:
11317
diff
changeset
|
14 branch: default |
|
34e33d50c26b
subrepo: correctly handle update -C with modified subrepos (issue2022)
Matt Mackall <mpm@selenic.com>
parents:
11317
diff
changeset
|
15 commit: 1 subrepos |
|
34e33d50c26b
subrepo: correctly handle update -C with modified subrepos (issue2022)
Matt Mackall <mpm@selenic.com>
parents:
11317
diff
changeset
|
16 update: (current) |
|
34e33d50c26b
subrepo: correctly handle update -C with modified subrepos (issue2022)
Matt Mackall <mpm@selenic.com>
parents:
11317
diff
changeset
|
17 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
34e33d50c26b
subrepo: correctly handle update -C with modified subrepos (issue2022)
Matt Mackall <mpm@selenic.com>
parents:
11317
diff
changeset
|
18 parent: 1:7cf8cfea66e4 tip |
|
34e33d50c26b
subrepo: correctly handle update -C with modified subrepos (issue2022)
Matt Mackall <mpm@selenic.com>
parents:
11317
diff
changeset
|
19 1 |
|
34e33d50c26b
subrepo: correctly handle update -C with modified subrepos (issue2022)
Matt Mackall <mpm@selenic.com>
parents:
11317
diff
changeset
|
20 branch: default |
|
34e33d50c26b
subrepo: correctly handle update -C with modified subrepos (issue2022)
Matt Mackall <mpm@selenic.com>
parents:
11317
diff
changeset
|
21 commit: (clean) |
|
34e33d50c26b
subrepo: correctly handle update -C with modified subrepos (issue2022)
Matt Mackall <mpm@selenic.com>
parents:
11317
diff
changeset
|
22 update: (current) |
| 8816 | 23 % add sub sub |
|
11088
c4347e48b0d0
summary: add subrepo status
Matt Mackall <mpm@selenic.com>
parents:
11086
diff
changeset
|
24 parent: 1:7cf8cfea66e4 tip |
|
c4347e48b0d0
summary: add subrepo status
Matt Mackall <mpm@selenic.com>
parents:
11086
diff
changeset
|
25 1 |
|
c4347e48b0d0
summary: add subrepo status
Matt Mackall <mpm@selenic.com>
parents:
11086
diff
changeset
|
26 branch: default |
|
c4347e48b0d0
summary: add subrepo status
Matt Mackall <mpm@selenic.com>
parents:
11086
diff
changeset
|
27 commit: 1 subrepos |
|
c4347e48b0d0
summary: add subrepo status
Matt Mackall <mpm@selenic.com>
parents:
11086
diff
changeset
|
28 update: (current) |
| 8816 | 29 committing subrepository s |
| 11113 | 30 committing subrepository s/ss |
|
11088
c4347e48b0d0
summary: add subrepo status
Matt Mackall <mpm@selenic.com>
parents:
11086
diff
changeset
|
31 parent: 2:df30734270ae tip |
|
c4347e48b0d0
summary: add subrepo status
Matt Mackall <mpm@selenic.com>
parents:
11086
diff
changeset
|
32 2 |
|
c4347e48b0d0
summary: add subrepo status
Matt Mackall <mpm@selenic.com>
parents:
11086
diff
changeset
|
33 branch: default |
|
c4347e48b0d0
summary: add subrepo status
Matt Mackall <mpm@selenic.com>
parents:
11086
diff
changeset
|
34 commit: (clean) |
|
c4347e48b0d0
summary: add subrepo status
Matt Mackall <mpm@selenic.com>
parents:
11086
diff
changeset
|
35 update: (current) |
| 8816 | 36 % bump sub rev |
| 37 committing subrepository s | |
| 38 % leave sub dirty | |
| 39 committing subrepository s | |
| 40 changeset: 3:1c833a7a9e3a | |
| 41 tag: tip | |
| 42 user: test | |
| 43 date: Thu Jan 01 00:00:00 1970 +0000 | |
| 44 summary: 4 | |
| 45 | |
| 46 % check caching | |
| 47 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
| 48 % restore | |
| 49 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 50 path s | |
| 51 source s | |
| 52 revision 1c833a7a9e3a4445c711aaf0f012379cd0d4034e | |
| 53 % new branch for merge tests | |
| 54 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 55 adding t/t | |
| 56 % 5 | |
| 57 committing subrepository t | |
| 58 created new head | |
| 59 % 6 | |
| 60 committing subrepository t | |
| 61 path s | |
| 62 source s | |
| 63 revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 | |
| 64 path t | |
| 65 source t | |
| 66 revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad | |
| 67 % 7 | |
| 68 committing subrepository t | |
| 69 % 8 | |
| 70 % merge tests | |
| 71 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 72 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 73 (branch merge, don't forget to commit) | |
| 74 path s | |
| 75 source s | |
| 76 revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 | |
| 77 path t | |
| 78 source t | |
| 79 revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382 | |
| 80 created new head | |
| 81 searching for copies back to rev 2 | |
| 82 resolving manifests | |
| 83 overwrite None partial False | |
| 84 ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4 | |
| 85 .hgsubstate: versions differ -> m | |
|
11716
db426935fa94
progress: use gerund (updating) for merge progress
timeless <timeless@gmail.com>
parents:
11485
diff
changeset
|
86 updating: .hgsubstate 1/1 files (100.00%) |
|
9783
ee00ef6f9be7
submerge: properly deal with overwrites
Matt Mackall <mpm@selenic.com>
parents:
9611
diff
changeset
|
87 subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec |
|
10177
5ca0d220ae21
subrepo: add table-based dispatch for subrepo types
Augie Fackler <durin42@gmail.com>
parents:
9783
diff
changeset
|
88 subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg |
|
9783
ee00ef6f9be7
submerge: properly deal with overwrites
Matt Mackall <mpm@selenic.com>
parents:
9611
diff
changeset
|
89 getting subrepo t |
| 8816 | 90 resolving manifests |
| 91 overwrite True partial False | |
| 92 ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a | |
| 93 t: remote is newer -> g | |
|
11716
db426935fa94
progress: use gerund (updating) for merge progress
timeless <timeless@gmail.com>
parents:
11485
diff
changeset
|
94 updating: t 1/1 files (100.00%) |
| 8816 | 95 getting t |
| 96 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 97 (branch merge, don't forget to commit) | |
| 98 path s | |
| 99 source s | |
| 100 revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 | |
| 101 path t | |
| 102 source t | |
| 103 revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad | |
| 104 committing subrepository t | |
| 105 searching for copies back to rev 2 | |
| 106 resolving manifests | |
| 107 overwrite None partial False | |
| 108 ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf | |
| 109 .hgsubstate: versions differ -> m | |
|
11716
db426935fa94
progress: use gerund (updating) for merge progress
timeless <timeless@gmail.com>
parents:
11485
diff
changeset
|
110 updating: .hgsubstate 1/1 files (100.00%) |
|
9783
ee00ef6f9be7
submerge: properly deal with overwrites
Matt Mackall <mpm@selenic.com>
parents:
9611
diff
changeset
|
111 subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4 |
|
10177
5ca0d220ae21
subrepo: add table-based dispatch for subrepo types
Augie Fackler <durin42@gmail.com>
parents:
9783
diff
changeset
|
112 subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg |
|
9783
ee00ef6f9be7
submerge: properly deal with overwrites
Matt Mackall <mpm@selenic.com>
parents:
9611
diff
changeset
|
113 merging subrepo t |
| 8816 | 114 searching for copies back to rev 2 |
| 115 resolving manifests | |
| 116 overwrite None partial False | |
| 117 ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198 | |
| 118 t: versions differ -> m | |
| 119 preserving t for resolve of t | |
|
11716
db426935fa94
progress: use gerund (updating) for merge progress
timeless <timeless@gmail.com>
parents:
11485
diff
changeset
|
120 updating: t 1/1 files (100.00%) |
| 8816 | 121 picked tool 'internal:merge' for t (binary False symlink False) |
| 122 merging t | |
| 123 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a | |
| 124 warning: conflicts during merge. | |
| 125 merging t failed! | |
| 126 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
|
9468
b2310903c462
hg: say 'hg update' instead of 'hg up' in merge status message
Stuart W Marks <smarks@smarks.org>
parents:
8995
diff
changeset
|
127 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 8816 | 128 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 129 (branch merge, don't forget to commit) | |
| 130 % should conflict | |
| 131 <<<<<<< local | |
| 132 conflict | |
| 133 ======= | |
| 134 t3 | |
| 135 >>>>>>> other | |
| 136 % clone | |
|
9611
a3d73b3e1f8a
hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents:
9468
diff
changeset
|
137 updating to branch default |
|
10668
05856e682521
subrepo: print subrepo pulling URL
Edouard Gomez <ed.gomez@free.fr>
parents:
10522
diff
changeset
|
138 pulling subrepo s from .../sub/t/s |
| 8816 | 139 requesting all changes |
| 140 adding changesets | |
| 141 adding manifests | |
| 142 adding file changes | |
| 143 added 4 changesets with 5 changes to 3 files | |
|
11112
4a9bee613737
subrepo: print paths relative to upper repo root for push/pull/commit
Edouard Gomez <ed.gomez@free.fr>
parents:
11111
diff
changeset
|
144 pulling subrepo s/ss from .../sub/t/s/ss |
| 8816 | 145 requesting all changes |
| 146 adding changesets | |
| 147 adding manifests | |
| 148 adding file changes | |
| 149 added 1 changesets with 1 changes to 1 files | |
|
10668
05856e682521
subrepo: print subrepo pulling URL
Edouard Gomez <ed.gomez@free.fr>
parents:
10522
diff
changeset
|
150 pulling subrepo t from .../sub/t/t |
| 8816 | 151 requesting all changes |
| 152 adding changesets | |
| 153 adding manifests | |
| 154 adding file changes | |
| 155 added 4 changesets with 4 changes to 1 files (+1 heads) | |
| 156 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 157 path s | |
| 158 source s | |
| 159 revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 | |
| 160 path t | |
| 161 source t | |
| 162 revision 20a0db6fbf6c3d2836e6519a642ae929bfc67c0e | |
| 163 % push | |
| 164 committing subrepository t | |
| 165 pushing ...sub/t | |
|
11111
d2da9e6dd13e
subrepo: print pushing url
Edouard Gomez <ed.gomez@free.fr>
parents:
11109
diff
changeset
|
166 pushing ...sub/t/s/ss |
| 8816 | 167 searching for changes |
| 168 no changes found | |
|
11111
d2da9e6dd13e
subrepo: print pushing url
Edouard Gomez <ed.gomez@free.fr>
parents:
11109
diff
changeset
|
169 pushing ...sub/t/s |
| 8816 | 170 searching for changes |
| 171 no changes found | |
|
11111
d2da9e6dd13e
subrepo: print pushing url
Edouard Gomez <ed.gomez@free.fr>
parents:
11109
diff
changeset
|
172 pushing ...sub/t/t |
| 8816 | 173 searching for changes |
| 174 adding changesets | |
| 175 adding manifests | |
| 176 adding file changes | |
| 177 added 1 changesets with 1 changes to 1 files | |
| 178 searching for changes | |
| 179 adding changesets | |
| 180 adding manifests | |
| 181 adding file changes | |
| 182 added 1 changesets with 1 changes to 1 files | |
| 183 % push -f | |
| 184 committing subrepository s | |
|
10396
65a90c8e11ee
prepush: add more precise error messages
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10378
diff
changeset
|
185 abort: push creates new remote heads on branch 'default'! |
|
11683
757f39fa1162
dispatch: write Abort hint to stderr too
Patrick Mezard <pmezard@gmail.com>
parents:
11485
diff
changeset
|
186 (did you forget to merge? use push -f to force) |
| 8816 | 187 pushing ...sub/t |
|
11111
d2da9e6dd13e
subrepo: print pushing url
Edouard Gomez <ed.gomez@free.fr>
parents:
11109
diff
changeset
|
188 pushing ...sub/t/s/ss |
| 8816 | 189 searching for changes |
| 190 no changes found | |
|
11111
d2da9e6dd13e
subrepo: print pushing url
Edouard Gomez <ed.gomez@free.fr>
parents:
11109
diff
changeset
|
191 pushing ...sub/t/s |
| 8816 | 192 searching for changes |
| 193 pushing ...sub/t | |
|
11111
d2da9e6dd13e
subrepo: print pushing url
Edouard Gomez <ed.gomez@free.fr>
parents:
11109
diff
changeset
|
194 pushing ...sub/t/s/ss |
| 8816 | 195 searching for changes |
| 196 no changes found | |
|
11111
d2da9e6dd13e
subrepo: print pushing url
Edouard Gomez <ed.gomez@free.fr>
parents:
11109
diff
changeset
|
197 pushing ...sub/t/s |
| 8816 | 198 searching for changes |
| 199 adding changesets | |
| 200 adding manifests | |
| 201 adding file changes | |
| 202 added 1 changesets with 1 changes to 1 files (+1 heads) | |
|
11111
d2da9e6dd13e
subrepo: print pushing url
Edouard Gomez <ed.gomez@free.fr>
parents:
11109
diff
changeset
|
203 pushing ...sub/t/t |
| 8816 | 204 searching for changes |
| 205 no changes found | |
| 206 searching for changes | |
|
11068
a375d1777594
subrepo: update test output for issue1977 fix
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
10697
diff
changeset
|
207 adding changesets |
|
a375d1777594
subrepo: update test output for issue1977 fix
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
10697
diff
changeset
|
208 adding manifests |
|
a375d1777594
subrepo: update test output for issue1977 fix
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
10697
diff
changeset
|
209 adding file changes |
|
a375d1777594
subrepo: update test output for issue1977 fix
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
10697
diff
changeset
|
210 added 1 changesets with 1 changes to 1 files |
| 8816 | 211 % update |
| 212 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 213 committing subrepository t | |
| 214 % pull | |
| 215 pulling ...sub/t | |
| 216 searching for changes | |
| 217 adding changesets | |
| 218 adding manifests | |
| 219 adding file changes | |
| 220 added 1 changesets with 1 changes to 1 files | |
| 221 (run 'hg update' to get a working copy) | |
|
10668
05856e682521
subrepo: print subrepo pulling URL
Edouard Gomez <ed.gomez@free.fr>
parents:
10522
diff
changeset
|
222 pulling subrepo t from .../sub/t/t |
| 8816 | 223 searching for changes |
| 224 adding changesets | |
| 225 adding manifests | |
| 226 adding file changes | |
| 227 added 1 changesets with 1 changes to 1 files | |
| 228 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 229 blah | |
|
10177
5ca0d220ae21
subrepo: add table-based dispatch for subrepo types
Augie Fackler <durin42@gmail.com>
parents:
9783
diff
changeset
|
230 % bogus subrepo path aborts |
|
5ca0d220ae21
subrepo: add table-based dispatch for subrepo types
Augie Fackler <durin42@gmail.com>
parents:
9783
diff
changeset
|
231 abort: missing ] in subrepo source |
|
10251
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
232 % issue 1986 |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
233 adding a |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
234 marked working directory as branch br |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
235 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
236 adding b |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
237 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
238 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
239 (branch merge, don't forget to commit) |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
240 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
241 adding c |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
242 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
243 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
244 (branch merge, don't forget to commit) |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
245 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
246 adding .hgsub |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
247 committing subrepository s |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
248 marked working directory as branch br |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
249 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
250 adding b |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
251 committing subrepository s |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
252 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
253 adding c |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
254 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
255 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
256 (branch merge, don't forget to commit) |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
257 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
258 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
259 adding d |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
260 committing subrepository s |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
261 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
262 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
263 adding e |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
264 committing subrepository s |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
265 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
266 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
267 (branch merge, don't forget to commit) |
|
10522
b07d487009b2
subrepo: Update .hgsubstate in case of deleted subrepo
Saint Germain <saintger@gmail.com>
parents:
10468
diff
changeset
|
268 % test subrepo delete from .hgsubstate |
|
b07d487009b2
subrepo: Update .hgsubstate in case of deleted subrepo
Saint Germain <saintger@gmail.com>
parents:
10468
diff
changeset
|
269 adding testdelete/nested/foo |
|
b07d487009b2
subrepo: Update .hgsubstate in case of deleted subrepo
Saint Germain <saintger@gmail.com>
parents:
10468
diff
changeset
|
270 adding testdelete/nested2/foo |
|
b07d487009b2
subrepo: Update .hgsubstate in case of deleted subrepo
Saint Germain <saintger@gmail.com>
parents:
10468
diff
changeset
|
271 adding testdelete/.hgsub |
|
b07d487009b2
subrepo: Update .hgsubstate in case of deleted subrepo
Saint Germain <saintger@gmail.com>
parents:
10468
diff
changeset
|
272 committing subrepository nested2 |
|
b07d487009b2
subrepo: Update .hgsubstate in case of deleted subrepo
Saint Germain <saintger@gmail.com>
parents:
10468
diff
changeset
|
273 committing subrepository nested |
|
b07d487009b2
subrepo: Update .hgsubstate in case of deleted subrepo
Saint Germain <saintger@gmail.com>
parents:
10468
diff
changeset
|
274 nested |
|
10378
e1401c74572f
subrepo: change default path in hgrc of subrepo after cloning
Saint Germain <saintger@gmail.com>
parents:
10252
diff
changeset
|
275 % test repository cloning |
|
e1401c74572f
subrepo: change default path in hgrc of subrepo after cloning
Saint Germain <saintger@gmail.com>
parents:
10252
diff
changeset
|
276 adding nested_absolute/foo |
|
e1401c74572f
subrepo: change default path in hgrc of subrepo after cloning
Saint Germain <saintger@gmail.com>
parents:
10252
diff
changeset
|
277 adding nested_relative/foo2 |
|
e1401c74572f
subrepo: change default path in hgrc of subrepo after cloning
Saint Germain <saintger@gmail.com>
parents:
10252
diff
changeset
|
278 adding main/.hgsub |
|
e1401c74572f
subrepo: change default path in hgrc of subrepo after cloning
Saint Germain <saintger@gmail.com>
parents:
10252
diff
changeset
|
279 committing subrepository nested_relative |
|
e1401c74572f
subrepo: change default path in hgrc of subrepo after cloning
Saint Germain <saintger@gmail.com>
parents:
10252
diff
changeset
|
280 committing subrepository nested_absolute |
|
e1401c74572f
subrepo: change default path in hgrc of subrepo after cloning
Saint Germain <saintger@gmail.com>
parents:
10252
diff
changeset
|
281 updating to branch default |
|
e1401c74572f
subrepo: change default path in hgrc of subrepo after cloning
Saint Germain <saintger@gmail.com>
parents:
10252
diff
changeset
|
282 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
e1401c74572f
subrepo: change default path in hgrc of subrepo after cloning
Saint Germain <saintger@gmail.com>
parents:
10252
diff
changeset
|
283 [paths] |
|
10697
c90d923fff64
subrepo: fix hgrc paths section during subrepo pulling
Edouard Gomez <ed.gomez@free.fr>
parents:
10522
diff
changeset
|
284 default = $HGTMP/test-subrepo/sub/mercurial/nested_absolute |
|
10378
e1401c74572f
subrepo: change default path in hgrc of subrepo after cloning
Saint Germain <saintger@gmail.com>
parents:
10252
diff
changeset
|
285 [paths] |
|
11109
a2bc2f2d77a9
subrepo: normalize path part of URLs so that pulling subrepos from webdir works
Edouard Gomez <ed.gomez@free.fr>
parents:
11088
diff
changeset
|
286 default = $HGTMP/test-subrepo/sub/mercurial/nested_relative |
|
11069
12f04d18143e
subrepo: add test for issue1977
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
11068
diff
changeset
|
287 % issue 1977 |
|
12f04d18143e
subrepo: add test for issue1977
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
11068
diff
changeset
|
288 adding a |
|
12f04d18143e
subrepo: add test for issue1977
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
11068
diff
changeset
|
289 adding .hgsub |
|
12f04d18143e
subrepo: add test for issue1977
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
11068
diff
changeset
|
290 committing subrepository s |
|
12f04d18143e
subrepo: add test for issue1977
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
11068
diff
changeset
|
291 updating to branch default |
|
11086
c2601c216333
Adjusted output of test-subrepo for issue1977 to 05856e682521
Thomas Arendsen Hein <thomas@intevation.de>
parents:
11078
diff
changeset
|
292 pulling subrepo s from .../sub/repo/s |
|
11069
12f04d18143e
subrepo: add test for issue1977
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
11068
diff
changeset
|
293 requesting all changes |
|
12f04d18143e
subrepo: add test for issue1977
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
11068
diff
changeset
|
294 adding changesets |
|
12f04d18143e
subrepo: add test for issue1977
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
11068
diff
changeset
|
295 adding manifests |
|
12f04d18143e
subrepo: add test for issue1977
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
11068
diff
changeset
|
296 adding file changes |
|
12f04d18143e
subrepo: add test for issue1977
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
11068
diff
changeset
|
297 added 1 changesets with 1 changes to 1 files |
|
12f04d18143e
subrepo: add test for issue1977
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
11068
diff
changeset
|
298 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
12f04d18143e
subrepo: add test for issue1977
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
11068
diff
changeset
|
299 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
12f04d18143e
subrepo: add test for issue1977
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
11068
diff
changeset
|
300 created new head |
|
12f04d18143e
subrepo: add test for issue1977
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
11068
diff
changeset
|
301 committing subrepository s |
|
12f04d18143e
subrepo: add test for issue1977
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
11068
diff
changeset
|
302 abort: push creates new remote heads on branch 'default'! |
|
11683
757f39fa1162
dispatch: write Abort hint to stderr too
Patrick Mezard <pmezard@gmail.com>
parents:
11485
diff
changeset
|
303 (did you forget to merge? use push -f to force) |
|
11069
12f04d18143e
subrepo: add test for issue1977
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
11068
diff
changeset
|
304 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |