equal
deleted
inserted
replaced
212 getting subrepo t |
212 getting subrepo t |
213 resolving manifests |
213 resolving manifests |
214 branchmerge: False, force: False, partial: False |
214 branchmerge: False, force: False, partial: False |
215 ancestor: 60ca1237c194, local: 60ca1237c194+, remote: 6747d179aa9a |
215 ancestor: 60ca1237c194, local: 60ca1237c194+, remote: 6747d179aa9a |
216 t: remote is newer -> g |
216 t: remote is newer -> g |
|
217 getting t |
217 updating: t 1/1 files (100.00%) |
218 updating: t 1/1 files (100.00%) |
218 getting t |
|
219 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
219 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
220 (branch merge, don't forget to commit) |
220 (branch merge, don't forget to commit) |
221 $ hg debugsub |
221 $ hg debugsub |
222 path s |
222 path s |
223 source s |
223 source s |