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