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