Mercurial > public > mercurial-scm > hg
comparison mercurial/subrepo.py @ 13857:ba1f98f877ec
subrepo: process merge substate in sorted order in submerge()
This ensures that subrepositories are pulled in a well defined
order when cloning the parent repository.
BEFORE:
$ hg clone http://hg.gerg.ca/allextensions
destination directory: allextensions
requesting all changes
adding changesets
adding manifests
adding file changes
added 10 changesets with 20 changes to 6 files
updating to branch default
pulling subrepo caseguard from http://bitbucket.org/alexandru/caseguard
real URL is https://bitbucket.org/alexandru/caseguard
requesting all changes
adding changesets
adding manifests
adding file changes
added 81 changesets with 100 changes to 13 files
pulling subrepo hg-prompt from http://bitbucket.org/sjl/hg-prompt
real URL is https://bitbucket.org/sjl/hg-prompt
requesting all changes
adding changesets
adding manifests
adding file changes
added 114 changesets with 176 changes to 35 files
pulling subrepo hgpaste from http://bitbucket.org/birkenfeld/hgpaste
real URL is https://bitbucket.org/birkenfeld/hgpaste
requesting all changes
adding changesets
adding manifests
adding file changes
added 18 changesets with 18 changes to 2 files
...
AFTER:
$ hg clone http://hg.gerg.ca/allextensions
destination directory: allextensions
requesting all changes
adding changesets
adding manifests
adding file changes
added 10 changesets with 20 changes to 6 files
updating to branch default
pulling subrepo Artemis from http://hg.mrzv.org/Artemis
requesting all changes
adding changesets
adding manifests
adding file changes
added 55 changesets with 108 changes to 47 files
...
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Sun, 03 Apr 2011 01:57:17 +0200 |
parents | ce6227306c9a |
children | d3f90ff904b8 |
comparison
equal
deleted
inserted
replaced
13856:0995eee8ffe4 | 13857:ba1f98f877ec |
---|---|
142 'use (c)hanged version or (d)elete?') % s, | 142 'use (c)hanged version or (d)elete?') % s, |
143 (_('&Changed'), _('&Delete')), 0): | 143 (_('&Changed'), _('&Delete')), 0): |
144 debug(s, "prompt remove") | 144 debug(s, "prompt remove") |
145 wctx.sub(s).remove() | 145 wctx.sub(s).remove() |
146 | 146 |
147 for s, r in s2.items(): | 147 for s, r in sorted(s2.items()): |
148 if s in s1: | 148 if s in s1: |
149 continue | 149 continue |
150 elif s not in sa: | 150 elif s not in sa: |
151 debug(s, "remote added, get", r) | 151 debug(s, "remote added, get", r) |
152 mctx.sub(s).get(r) | 152 mctx.sub(s).get(r) |