Mercurial > hg
annotate tests/test-subrepo.out @ 10723:8ea152e94484
check-code: fix check-code complaint
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 17 Mar 2010 15:36:48 -0500 |
| parents | 7b0a0d498cc0 |
| children | 37d1b20168d1 |
| rev | line source |
|---|---|
| 8816 | 1 % first revision, no sub |
| 2 adding a | |
| 3 % add first sub | |
| 4 adding a | |
| 5 committing subrepository s | |
| 6 % add sub sub | |
| 7 committing subrepository s | |
| 8 committing subrepository ss | |
| 9 % bump sub rev | |
| 10 committing subrepository s | |
| 11 % leave sub dirty | |
| 12 committing subrepository s | |
| 13 changeset: 3:1c833a7a9e3a | |
| 14 tag: tip | |
| 15 user: test | |
| 16 date: Thu Jan 01 00:00:00 1970 +0000 | |
| 17 summary: 4 | |
| 18 | |
| 19 % check caching | |
| 20 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
| 21 % restore | |
| 22 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 23 path s | |
| 24 source s | |
| 25 revision 1c833a7a9e3a4445c711aaf0f012379cd0d4034e | |
| 26 % new branch for merge tests | |
| 27 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 28 adding t/t | |
| 29 % 5 | |
| 30 committing subrepository t | |
| 31 created new head | |
| 32 % 6 | |
| 33 committing subrepository t | |
| 34 path s | |
| 35 source s | |
| 36 revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 | |
| 37 path t | |
| 38 source t | |
| 39 revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad | |
| 40 % 7 | |
| 41 committing subrepository t | |
| 42 % 8 | |
| 43 % merge tests | |
| 44 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 45 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 46 (branch merge, don't forget to commit) | |
| 47 path s | |
| 48 source s | |
| 49 revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 | |
| 50 path t | |
| 51 source t | |
| 52 revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382 | |
| 53 created new head | |
| 54 searching for copies back to rev 2 | |
| 55 resolving manifests | |
| 56 overwrite None partial False | |
| 57 ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4 | |
| 58 .hgsubstate: versions differ -> m | |
|
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
10396
diff
changeset
|
59 update: .hgsubstate 1/1 files (100.00%) |
|
9783
ee00ef6f9be7
submerge: properly deal with overwrites
Matt Mackall <mpm@selenic.com>
parents:
9611
diff
changeset
|
60 subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec |
|
10177
5ca0d220ae21
subrepo: add table-based dispatch for subrepo types
Augie Fackler <durin42@gmail.com>
parents:
9783
diff
changeset
|
61 subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg |
|
9783
ee00ef6f9be7
submerge: properly deal with overwrites
Matt Mackall <mpm@selenic.com>
parents:
9611
diff
changeset
|
62 getting subrepo t |
| 8816 | 63 resolving manifests |
| 64 overwrite True partial False | |
| 65 ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a | |
| 66 t: remote is newer -> g | |
|
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
10396
diff
changeset
|
67 update: t 1/1 files (100.00%) |
| 8816 | 68 getting t |
| 69 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 70 (branch merge, don't forget to commit) | |
| 71 path s | |
| 72 source s | |
| 73 revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 | |
| 74 path t | |
| 75 source t | |
| 76 revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad | |
| 77 committing subrepository t | |
| 78 searching for copies back to rev 2 | |
| 79 resolving manifests | |
| 80 overwrite None partial False | |
| 81 ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf | |
| 82 .hgsubstate: versions differ -> m | |
|
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
10396
diff
changeset
|
83 update: .hgsubstate 1/1 files (100.00%) |
|
9783
ee00ef6f9be7
submerge: properly deal with overwrites
Matt Mackall <mpm@selenic.com>
parents:
9611
diff
changeset
|
84 subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4 |
|
10177
5ca0d220ae21
subrepo: add table-based dispatch for subrepo types
Augie Fackler <durin42@gmail.com>
parents:
9783
diff
changeset
|
85 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
|
86 merging subrepo t |
| 8816 | 87 searching for copies back to rev 2 |
| 88 resolving manifests | |
| 89 overwrite None partial False | |
| 90 ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198 | |
| 91 t: versions differ -> m | |
| 92 preserving t for resolve of t | |
|
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
10396
diff
changeset
|
93 update: t 1/1 files (100.00%) |
| 8816 | 94 picked tool 'internal:merge' for t (binary False symlink False) |
| 95 merging t | |
| 96 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a | |
| 97 warning: conflicts during merge. | |
| 98 merging t failed! | |
| 99 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
|
100 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 8816 | 101 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 102 (branch merge, don't forget to commit) | |
| 103 % should conflict | |
| 104 <<<<<<< local | |
| 105 conflict | |
| 106 ======= | |
| 107 t3 | |
| 108 >>>>>>> other | |
| 109 % clone | |
|
9611
a3d73b3e1f8a
hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents:
9468
diff
changeset
|
110 updating to branch default |
|
10668
05856e682521
subrepo: print subrepo pulling URL
Edouard Gomez <ed.gomez@free.fr>
parents:
10522
diff
changeset
|
111 pulling subrepo s from .../sub/t/s |
| 8816 | 112 requesting all changes |
| 113 adding changesets | |
| 114 adding manifests | |
| 115 adding file changes | |
| 116 added 4 changesets with 5 changes to 3 files | |
|
10668
05856e682521
subrepo: print subrepo pulling URL
Edouard Gomez <ed.gomez@free.fr>
parents:
10522
diff
changeset
|
117 pulling subrepo ss from .../sub/t/s/ss |
| 8816 | 118 requesting all changes |
| 119 adding changesets | |
| 120 adding manifests | |
| 121 adding file changes | |
| 122 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
|
123 pulling subrepo t from .../sub/t/t |
| 8816 | 124 requesting all changes |
| 125 adding changesets | |
| 126 adding manifests | |
| 127 adding file changes | |
| 128 added 4 changesets with 4 changes to 1 files (+1 heads) | |
| 129 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 130 path s | |
| 131 source s | |
| 132 revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 | |
| 133 path t | |
| 134 source t | |
| 135 revision 20a0db6fbf6c3d2836e6519a642ae929bfc67c0e | |
| 136 % push | |
| 137 committing subrepository t | |
| 138 pushing ...sub/t | |
| 139 pushing ...subrepo ss | |
| 140 searching for changes | |
| 141 no changes found | |
| 142 pushing ...subrepo s | |
| 143 searching for changes | |
| 144 no changes found | |
| 145 pushing ...subrepo t | |
| 146 searching for changes | |
| 147 adding changesets | |
| 148 adding manifests | |
| 149 adding file changes | |
| 150 added 1 changesets with 1 changes to 1 files | |
| 151 searching for changes | |
| 152 adding changesets | |
| 153 adding manifests | |
| 154 adding file changes | |
| 155 added 1 changesets with 1 changes to 1 files | |
| 156 % push -f | |
| 157 committing subrepository s | |
|
10396
65a90c8e11ee
prepush: add more precise error messages
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
10378
diff
changeset
|
158 abort: push creates new remote heads on branch 'default'! |
| 8816 | 159 pushing ...sub/t |
| 160 pushing ...subrepo ss | |
| 161 searching for changes | |
| 162 no changes found | |
| 163 pushing ...subrepo s | |
| 164 searching for changes | |
| 165 (did you forget to merge? use push -f to force) | |
| 166 pushing ...subrepo t | |
| 167 searching for changes | |
| 168 no changes found | |
| 169 searching for changes | |
| 170 adding changesets | |
| 171 adding manifests | |
| 172 adding file changes | |
| 173 added 1 changesets with 1 changes to 1 files | |
| 174 pushing ...sub/t | |
| 175 pushing ...subrepo ss | |
| 176 searching for changes | |
| 177 no changes found | |
| 178 pushing ...subrepo s | |
| 179 searching for changes | |
| 180 adding changesets | |
| 181 adding manifests | |
| 182 adding file changes | |
| 183 added 1 changesets with 1 changes to 1 files (+1 heads) | |
| 184 pushing ...subrepo t | |
| 185 searching for changes | |
| 186 no changes found | |
| 187 searching for changes | |
| 188 no changes found | |
| 189 % update | |
| 190 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 191 committing subrepository t | |
| 192 % pull | |
| 193 pulling ...sub/t | |
| 194 searching for changes | |
| 195 adding changesets | |
| 196 adding manifests | |
| 197 adding file changes | |
| 198 added 1 changesets with 1 changes to 1 files | |
| 199 (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
|
200 pulling subrepo t from .../sub/t/t |
| 8816 | 201 searching for changes |
| 202 adding changesets | |
| 203 adding manifests | |
| 204 adding file changes | |
| 205 added 1 changesets with 1 changes to 1 files | |
| 206 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 207 blah | |
|
10177
5ca0d220ae21
subrepo: add table-based dispatch for subrepo types
Augie Fackler <durin42@gmail.com>
parents:
9783
diff
changeset
|
208 % bogus subrepo path aborts |
|
5ca0d220ae21
subrepo: add table-based dispatch for subrepo types
Augie Fackler <durin42@gmail.com>
parents:
9783
diff
changeset
|
209 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
|
210 % issue 1986 |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
211 adding a |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
212 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
|
213 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
|
214 adding b |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
215 created new head |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
216 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
|
217 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
|
218 (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
|
219 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
|
220 adding c |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
221 created new head |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
222 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
|
223 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
|
224 (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
|
225 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
|
226 adding .hgsub |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
227 committing subrepository s |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
228 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
|
229 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
|
230 adding b |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
231 committing subrepository s |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
232 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
|
233 adding c |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
234 created new head |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
235 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
|
236 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
|
237 (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
|
238 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
|
239 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
|
240 adding d |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
241 committing subrepository s |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
242 created new head |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
243 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
|
244 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
|
245 adding e |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
246 committing subrepository s |
|
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
9783
diff
changeset
|
247 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
|
248 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
|
249 (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
|
250 % test subrepo delete from .hgsubstate |
|
b07d487009b2
subrepo: Update .hgsubstate in case of deleted subrepo
Saint Germain <saintger@gmail.com>
parents:
10468
diff
changeset
|
251 adding testdelete/nested/foo |
|
b07d487009b2
subrepo: Update .hgsubstate in case of deleted subrepo
Saint Germain <saintger@gmail.com>
parents:
10468
diff
changeset
|
252 adding testdelete/nested2/foo |
|
b07d487009b2
subrepo: Update .hgsubstate in case of deleted subrepo
Saint Germain <saintger@gmail.com>
parents:
10468
diff
changeset
|
253 adding testdelete/.hgsub |
|
b07d487009b2
subrepo: Update .hgsubstate in case of deleted subrepo
Saint Germain <saintger@gmail.com>
parents:
10468
diff
changeset
|
254 committing subrepository nested2 |
|
b07d487009b2
subrepo: Update .hgsubstate in case of deleted subrepo
Saint Germain <saintger@gmail.com>
parents:
10468
diff
changeset
|
255 committing subrepository nested |
|
b07d487009b2
subrepo: Update .hgsubstate in case of deleted subrepo
Saint Germain <saintger@gmail.com>
parents:
10468
diff
changeset
|
256 nested |
|
10378
e1401c74572f
subrepo: change default path in hgrc of subrepo after cloning
Saint Germain <saintger@gmail.com>
parents:
10252
diff
changeset
|
257 % test repository cloning |
|
e1401c74572f
subrepo: change default path in hgrc of subrepo after cloning
Saint Germain <saintger@gmail.com>
parents:
10252
diff
changeset
|
258 adding nested_absolute/foo |
|
e1401c74572f
subrepo: change default path in hgrc of subrepo after cloning
Saint Germain <saintger@gmail.com>
parents:
10252
diff
changeset
|
259 adding nested_relative/foo2 |
|
e1401c74572f
subrepo: change default path in hgrc of subrepo after cloning
Saint Germain <saintger@gmail.com>
parents:
10252
diff
changeset
|
260 adding main/.hgsub |
|
e1401c74572f
subrepo: change default path in hgrc of subrepo after cloning
Saint Germain <saintger@gmail.com>
parents:
10252
diff
changeset
|
261 committing subrepository nested_relative |
|
e1401c74572f
subrepo: change default path in hgrc of subrepo after cloning
Saint Germain <saintger@gmail.com>
parents:
10252
diff
changeset
|
262 committing subrepository nested_absolute |
|
e1401c74572f
subrepo: change default path in hgrc of subrepo after cloning
Saint Germain <saintger@gmail.com>
parents:
10252
diff
changeset
|
263 updating to branch default |
|
e1401c74572f
subrepo: change default path in hgrc of subrepo after cloning
Saint Germain <saintger@gmail.com>
parents:
10252
diff
changeset
|
264 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
|
265 [paths] |
|
10697
c90d923fff64
subrepo: fix hgrc paths section during subrepo pulling
Edouard Gomez <ed.gomez@free.fr>
parents:
10522
diff
changeset
|
266 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
|
267 [paths] |
|
10697
c90d923fff64
subrepo: fix hgrc paths section during subrepo pulling
Edouard Gomez <ed.gomez@free.fr>
parents:
10522
diff
changeset
|
268 default = $HGTMP/test-subrepo/sub/mercurial/main/../nested_relative |