# HG changeset patch # User Martin Geisler # Date 1268674571 -3600 # Node ID 7b0a0d498cc0f0d90a26da6d36ca708f8ac10485 # Parent 28e9a9907236248bfceccbd413aee08ca1e9738b# Parent e930017f9e2a29b4f44970c8beea656505d0baf1 Merge with stable diff -r 28e9a9907236 -r 7b0a0d498cc0 hgext/relink.py --- a/hgext/relink.py Sun Mar 14 23:18:50 2010 +0100 +++ b/hgext/relink.py Mon Mar 15 18:36:11 2010 +0100 @@ -139,13 +139,13 @@ continue try: relinkfile(source, tgt) - ui.progress(_('relink'), pos, f, _(' files'), total) + ui.progress(_('relinking'), pos, f, _(' files'), total) relinked += 1 savedbytes += sz except OSError, inst: ui.warn('%s: %s\n' % (tgt, str(inst))) - ui.progress(_('relink'), None, f, _(' files'), total) + ui.progress(_('relinking'), None, f, _(' files'), total) ui.status(_('relinked %d files (%d bytes reclaimed)\n') % (relinked, savedbytes)) diff -r 28e9a9907236 -r 7b0a0d498cc0 mercurial/localrepo.py --- a/mercurial/localrepo.py Sun Mar 14 23:18:50 2010 +0100 +++ b/mercurial/localrepo.py Mon Mar 15 18:36:11 2010 +0100 @@ -1826,9 +1826,9 @@ cnt = 0 for chnk in group: yield chnk - self.ui.progress(_('bundle changes'), cnt, unit=_('chunks')) + self.ui.progress(_('bundling changes'), cnt, unit=_('chunks')) cnt += 1 - self.ui.progress(_('bundle changes'), None, unit=_('chunks')) + self.ui.progress(_('bundling changes'), None, unit=_('chunks')) # Figure out which manifest nodes (of the ones we think might be @@ -1854,9 +1854,9 @@ cnt = 0 for chnk in group: yield chnk - self.ui.progress(_('bundle manifests'), cnt, unit=_('chunks')) + self.ui.progress(_('bundling manifests'), cnt, unit=_('chunks')) cnt += 1 - self.ui.progress(_('bundle manifests'), None, unit=_('chunks')) + self.ui.progress(_('bundling manifests'), None, unit=_('chunks')) # These are no longer needed, dereference and toss the memory for # them. @@ -1897,7 +1897,7 @@ lookup_filenode_link_func(fname)) for chnk in group: self.ui.progress( - _('bundle files'), cnt, item=fname, unit=_('chunks')) + _('bundling files'), cnt, item=fname, unit=_('chunks')) cnt += 1 yield chnk if fname in msng_filenode_set: @@ -1905,7 +1905,7 @@ del msng_filenode_set[fname] # Signal that no more groups are left. yield changegroup.closechunk() - self.ui.progress(_('bundle files'), None, unit=_('chunks')) + self.ui.progress(_('bundling files'), None, unit=_('chunks')) if msng_cl_lst: self.hook('outgoing', node=hex(msng_cl_lst[0]), source=source) @@ -1954,19 +1954,19 @@ cnt = 0 for chnk in cl.group(nodes, identity, collect): - self.ui.progress(_('bundle changes'), cnt, unit=_('chunks')) + self.ui.progress(_('bundling changes'), cnt, unit=_('chunks')) cnt += 1 yield chnk - self.ui.progress(_('bundle changes'), None, unit=_('chunks')) + self.ui.progress(_('bundling changes'), None, unit=_('chunks')) mnfst = self.manifest nodeiter = gennodelst(mnfst) cnt = 0 for chnk in mnfst.group(nodeiter, lookuprevlink_func(mnfst)): - self.ui.progress(_('bundle manifests'), cnt, unit=_('chunks')) + self.ui.progress(_('bundling manifests'), cnt, unit=_('chunks')) cnt += 1 yield chnk - self.ui.progress(_('bundle manifests'), None, unit=_('chunks')) + self.ui.progress(_('bundling manifests'), None, unit=_('chunks')) cnt = 0 for fname in sorted(changedfiles): @@ -1981,10 +1981,10 @@ lookup = lookuprevlink_func(filerevlog) for chnk in filerevlog.group(nodeiter, lookup): self.ui.progress( - _('bundle files'), cnt, item=fname, unit=_('chunks')) + _('bundling files'), cnt, item=fname, unit=_('chunks')) cnt += 1 yield chnk - self.ui.progress(_('bundle files'), None, unit=_('chunks')) + self.ui.progress(_('bundling files'), None, unit=_('chunks')) yield changegroup.closechunk() diff -r 28e9a9907236 -r 7b0a0d498cc0 mercurial/subrepo.py --- a/mercurial/subrepo.py Sun Mar 14 23:18:50 2010 +0100 +++ b/mercurial/subrepo.py Mon Mar 15 18:36:11 2010 +0100 @@ -193,8 +193,11 @@ fp.write('%s = %s\n' % (key, value)) self._repo.ui.setconfig('paths', key, value) - defpath = os.path.join(_abssource(ctx._repo), path) + defpath = _abssource(self._repo) + defpushpath = _abssource(self._repo, True) addpathconfig('default', defpath) + if defpath != defpushpath: + addpathconfig('default-push', defpushpath) fp.close() def dirty(self): diff -r 28e9a9907236 -r 7b0a0d498cc0 mercurial/verify.py --- a/mercurial/verify.py Sun Mar 14 23:18:50 2010 +0100 +++ b/mercurial/verify.py Mon Mar 15 18:36:11 2010 +0100 @@ -122,7 +122,7 @@ checklog(cl, "changelog", 0) total = len(repo) for i in repo: - ui.progress(_('changelog'), i, total=total) + ui.progress(_('checking'), i, total=total) n = cl.node(i) checkentry(cl, i, n, seen, [i], "changelog") @@ -133,14 +133,14 @@ filelinkrevs.setdefault(f, []).append(i) except Exception, inst: exc(i, _("unpacking changeset %s") % short(n), inst) - ui.progress(_('changelog'), None) + ui.progress(_('checking'), None) ui.status(_("checking manifests\n")) seen = {} checklog(mf, "manifest", 0) total = len(mf) for i in mf: - ui.progress(_('manifests'), i, total=total) + ui.progress(_('checking'), i, total=total) n = mf.node(i) lr = checkentry(mf, i, n, seen, mflinkrevs.get(n, []), "manifest") if n in mflinkrevs: @@ -156,7 +156,7 @@ filenodes.setdefault(f, {}).setdefault(fn, lr) except Exception, inst: exc(lr, _("reading manifest delta %s") % short(n), inst) - ui.progress(_('manifests'), None) + ui.progress(_('checking'), None) ui.status(_("crosschecking files in changesets and manifests\n")) @@ -166,13 +166,13 @@ for c, m in sorted([(c, m) for m in mflinkrevs for c in mflinkrevs[m]]): count += 1 - ui.progress(_('crosscheck'), count, total=total) + ui.progress(_('crosschecking'), count, total=total) err(c, _("changeset refers to unknown manifest %s") % short(m)) mflinkrevs = None # del is bad here due to scope issues for f in sorted(filelinkrevs): count += 1 - ui.progress(_('crosscheck'), count, total=total) + ui.progress(_('crosschecking'), count, total=total) if f not in filenodes: lr = filelinkrevs[f][0] err(lr, _("in changeset but not in manifest"), f) @@ -180,7 +180,7 @@ if havecl: for f in sorted(filenodes): count += 1 - ui.progress(_('crosscheck'), count, total=total) + ui.progress(_('crosschecking'), count, total=total) if f not in filelinkrevs: try: fl = repo.file(f) @@ -189,7 +189,7 @@ lr = None err(lr, _("in manifest but not in changeset"), f) - ui.progress(_('crosscheck'), None) + ui.progress(_('crosschecking'), None) ui.status(_("checking files\n")) @@ -203,7 +203,7 @@ files = sorted(set(filenodes) | set(filelinkrevs)) total = len(files) for i, f in enumerate(files): - ui.progress(_('files'), i, item=f, total=total) + ui.progress(_('checking'), i, item=f, total=total) try: linkrevs = filelinkrevs[f] except KeyError: @@ -281,7 +281,7 @@ fns = [(lr, n) for n, lr in filenodes[f].iteritems()] for lr, node in sorted(fns): err(lr, _("%s in manifests not found") % short(node), f) - ui.progress(_('files'), None) + ui.progress(_('checking'), None) for f in storefiles: warn(_("warning: orphan revlog '%s'") % f) diff -r 28e9a9907236 -r 7b0a0d498cc0 tests/test-acl.out --- a/tests/test-acl.out Sun Mar 14 23:18:50 2010 +0100 +++ b/tests/test-acl.out Mon Mar 15 18:36:11 2010 +0100 @@ -20,38 +20,38 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets -bundle changes: 0 chunks -bundle changes: 1 chunks -bundle changes: 2 chunks -bundle changes: 3 chunks -bundle changes: 4 chunks -bundle changes: 5 chunks -bundle changes: 6 chunks -bundle changes: 7 chunks -bundle changes: 8 chunks -bundle changes: 9 chunks -bundle manifests: 0 chunks -bundle manifests: 1 chunks -bundle manifests: 2 chunks -bundle manifests: 3 chunks -bundle manifests: 4 chunks -bundle manifests: 5 chunks -bundle manifests: 6 chunks -bundle manifests: 7 chunks -bundle manifests: 8 chunks -bundle manifests: 9 chunks -bundle files: foo/Bar/file.txt 0 chunks -bundle files: foo/Bar/file.txt 1 chunks -bundle files: foo/Bar/file.txt 2 chunks -bundle files: foo/Bar/file.txt 3 chunks -bundle files: foo/file.txt 4 chunks -bundle files: foo/file.txt 5 chunks -bundle files: foo/file.txt 6 chunks -bundle files: foo/file.txt 7 chunks -bundle files: quux/file.py 8 chunks -bundle files: quux/file.py 9 chunks -bundle files: quux/file.py 10 chunks -bundle files: quux/file.py 11 chunks +bundling changes: 0 chunks +bundling changes: 1 chunks +bundling changes: 2 chunks +bundling changes: 3 chunks +bundling changes: 4 chunks +bundling changes: 5 chunks +bundling changes: 6 chunks +bundling changes: 7 chunks +bundling changes: 8 chunks +bundling changes: 9 chunks +bundling manifests: 0 chunks +bundling manifests: 1 chunks +bundling manifests: 2 chunks +bundling manifests: 3 chunks +bundling manifests: 4 chunks +bundling manifests: 5 chunks +bundling manifests: 6 chunks +bundling manifests: 7 chunks +bundling manifests: 8 chunks +bundling manifests: 9 chunks +bundling files: foo/Bar/file.txt 0 chunks +bundling files: foo/Bar/file.txt 1 chunks +bundling files: foo/Bar/file.txt 2 chunks +bundling files: foo/Bar/file.txt 3 chunks +bundling files: foo/file.txt 4 chunks +bundling files: foo/file.txt 5 chunks +bundling files: foo/file.txt 6 chunks +bundling files: foo/file.txt 7 chunks +bundling files: quux/file.py 8 chunks +bundling files: quux/file.py 9 chunks +bundling files: quux/file.py 10 chunks +bundling files: quux/file.py 11 chunks changesets: 1 chunks add changeset ef1ea85a6374 changesets: 2 chunks @@ -90,38 +90,38 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets -bundle changes: 0 chunks -bundle changes: 1 chunks -bundle changes: 2 chunks -bundle changes: 3 chunks -bundle changes: 4 chunks -bundle changes: 5 chunks -bundle changes: 6 chunks -bundle changes: 7 chunks -bundle changes: 8 chunks -bundle changes: 9 chunks -bundle manifests: 0 chunks -bundle manifests: 1 chunks -bundle manifests: 2 chunks -bundle manifests: 3 chunks -bundle manifests: 4 chunks -bundle manifests: 5 chunks -bundle manifests: 6 chunks -bundle manifests: 7 chunks -bundle manifests: 8 chunks -bundle manifests: 9 chunks -bundle files: foo/Bar/file.txt 0 chunks -bundle files: foo/Bar/file.txt 1 chunks -bundle files: foo/Bar/file.txt 2 chunks -bundle files: foo/Bar/file.txt 3 chunks -bundle files: foo/file.txt 4 chunks -bundle files: foo/file.txt 5 chunks -bundle files: foo/file.txt 6 chunks -bundle files: foo/file.txt 7 chunks -bundle files: quux/file.py 8 chunks -bundle files: quux/file.py 9 chunks -bundle files: quux/file.py 10 chunks -bundle files: quux/file.py 11 chunks +bundling changes: 0 chunks +bundling changes: 1 chunks +bundling changes: 2 chunks +bundling changes: 3 chunks +bundling changes: 4 chunks +bundling changes: 5 chunks +bundling changes: 6 chunks +bundling changes: 7 chunks +bundling changes: 8 chunks +bundling changes: 9 chunks +bundling manifests: 0 chunks +bundling manifests: 1 chunks +bundling manifests: 2 chunks +bundling manifests: 3 chunks +bundling manifests: 4 chunks +bundling manifests: 5 chunks +bundling manifests: 6 chunks +bundling manifests: 7 chunks +bundling manifests: 8 chunks +bundling manifests: 9 chunks +bundling files: foo/Bar/file.txt 0 chunks +bundling files: foo/Bar/file.txt 1 chunks +bundling files: foo/Bar/file.txt 2 chunks +bundling files: foo/Bar/file.txt 3 chunks +bundling files: foo/file.txt 4 chunks +bundling files: foo/file.txt 5 chunks +bundling files: foo/file.txt 6 chunks +bundling files: foo/file.txt 7 chunks +bundling files: quux/file.py 8 chunks +bundling files: quux/file.py 9 chunks +bundling files: quux/file.py 10 chunks +bundling files: quux/file.py 11 chunks changesets: 1 chunks add changeset ef1ea85a6374 changesets: 2 chunks @@ -164,38 +164,38 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets -bundle changes: 0 chunks -bundle changes: 1 chunks -bundle changes: 2 chunks -bundle changes: 3 chunks -bundle changes: 4 chunks -bundle changes: 5 chunks -bundle changes: 6 chunks -bundle changes: 7 chunks -bundle changes: 8 chunks -bundle changes: 9 chunks -bundle manifests: 0 chunks -bundle manifests: 1 chunks -bundle manifests: 2 chunks -bundle manifests: 3 chunks -bundle manifests: 4 chunks -bundle manifests: 5 chunks -bundle manifests: 6 chunks -bundle manifests: 7 chunks -bundle manifests: 8 chunks -bundle manifests: 9 chunks -bundle files: foo/Bar/file.txt 0 chunks -bundle files: foo/Bar/file.txt 1 chunks -bundle files: foo/Bar/file.txt 2 chunks -bundle files: foo/Bar/file.txt 3 chunks -bundle files: foo/file.txt 4 chunks -bundle files: foo/file.txt 5 chunks -bundle files: foo/file.txt 6 chunks -bundle files: foo/file.txt 7 chunks -bundle files: quux/file.py 8 chunks -bundle files: quux/file.py 9 chunks -bundle files: quux/file.py 10 chunks -bundle files: quux/file.py 11 chunks +bundling changes: 0 chunks +bundling changes: 1 chunks +bundling changes: 2 chunks +bundling changes: 3 chunks +bundling changes: 4 chunks +bundling changes: 5 chunks +bundling changes: 6 chunks +bundling changes: 7 chunks +bundling changes: 8 chunks +bundling changes: 9 chunks +bundling manifests: 0 chunks +bundling manifests: 1 chunks +bundling manifests: 2 chunks +bundling manifests: 3 chunks +bundling manifests: 4 chunks +bundling manifests: 5 chunks +bundling manifests: 6 chunks +bundling manifests: 7 chunks +bundling manifests: 8 chunks +bundling manifests: 9 chunks +bundling files: foo/Bar/file.txt 0 chunks +bundling files: foo/Bar/file.txt 1 chunks +bundling files: foo/Bar/file.txt 2 chunks +bundling files: foo/Bar/file.txt 3 chunks +bundling files: foo/file.txt 4 chunks +bundling files: foo/file.txt 5 chunks +bundling files: foo/file.txt 6 chunks +bundling files: foo/file.txt 7 chunks +bundling files: quux/file.py 8 chunks +bundling files: quux/file.py 9 chunks +bundling files: quux/file.py 10 chunks +bundling files: quux/file.py 11 chunks changesets: 1 chunks add changeset ef1ea85a6374 changesets: 2 chunks @@ -243,38 +243,38 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets -bundle changes: 0 chunks -bundle changes: 1 chunks -bundle changes: 2 chunks -bundle changes: 3 chunks -bundle changes: 4 chunks -bundle changes: 5 chunks -bundle changes: 6 chunks -bundle changes: 7 chunks -bundle changes: 8 chunks -bundle changes: 9 chunks -bundle manifests: 0 chunks -bundle manifests: 1 chunks -bundle manifests: 2 chunks -bundle manifests: 3 chunks -bundle manifests: 4 chunks -bundle manifests: 5 chunks -bundle manifests: 6 chunks -bundle manifests: 7 chunks -bundle manifests: 8 chunks -bundle manifests: 9 chunks -bundle files: foo/Bar/file.txt 0 chunks -bundle files: foo/Bar/file.txt 1 chunks -bundle files: foo/Bar/file.txt 2 chunks -bundle files: foo/Bar/file.txt 3 chunks -bundle files: foo/file.txt 4 chunks -bundle files: foo/file.txt 5 chunks -bundle files: foo/file.txt 6 chunks -bundle files: foo/file.txt 7 chunks -bundle files: quux/file.py 8 chunks -bundle files: quux/file.py 9 chunks -bundle files: quux/file.py 10 chunks -bundle files: quux/file.py 11 chunks +bundling changes: 0 chunks +bundling changes: 1 chunks +bundling changes: 2 chunks +bundling changes: 3 chunks +bundling changes: 4 chunks +bundling changes: 5 chunks +bundling changes: 6 chunks +bundling changes: 7 chunks +bundling changes: 8 chunks +bundling changes: 9 chunks +bundling manifests: 0 chunks +bundling manifests: 1 chunks +bundling manifests: 2 chunks +bundling manifests: 3 chunks +bundling manifests: 4 chunks +bundling manifests: 5 chunks +bundling manifests: 6 chunks +bundling manifests: 7 chunks +bundling manifests: 8 chunks +bundling manifests: 9 chunks +bundling files: foo/Bar/file.txt 0 chunks +bundling files: foo/Bar/file.txt 1 chunks +bundling files: foo/Bar/file.txt 2 chunks +bundling files: foo/Bar/file.txt 3 chunks +bundling files: foo/file.txt 4 chunks +bundling files: foo/file.txt 5 chunks +bundling files: foo/file.txt 6 chunks +bundling files: foo/file.txt 7 chunks +bundling files: quux/file.py 8 chunks +bundling files: quux/file.py 9 chunks +bundling files: quux/file.py 10 chunks +bundling files: quux/file.py 11 chunks changesets: 1 chunks add changeset ef1ea85a6374 changesets: 2 chunks @@ -323,38 +323,38 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets -bundle changes: 0 chunks -bundle changes: 1 chunks -bundle changes: 2 chunks -bundle changes: 3 chunks -bundle changes: 4 chunks -bundle changes: 5 chunks -bundle changes: 6 chunks -bundle changes: 7 chunks -bundle changes: 8 chunks -bundle changes: 9 chunks -bundle manifests: 0 chunks -bundle manifests: 1 chunks -bundle manifests: 2 chunks -bundle manifests: 3 chunks -bundle manifests: 4 chunks -bundle manifests: 5 chunks -bundle manifests: 6 chunks -bundle manifests: 7 chunks -bundle manifests: 8 chunks -bundle manifests: 9 chunks -bundle files: foo/Bar/file.txt 0 chunks -bundle files: foo/Bar/file.txt 1 chunks -bundle files: foo/Bar/file.txt 2 chunks -bundle files: foo/Bar/file.txt 3 chunks -bundle files: foo/file.txt 4 chunks -bundle files: foo/file.txt 5 chunks -bundle files: foo/file.txt 6 chunks -bundle files: foo/file.txt 7 chunks -bundle files: quux/file.py 8 chunks -bundle files: quux/file.py 9 chunks -bundle files: quux/file.py 10 chunks -bundle files: quux/file.py 11 chunks +bundling changes: 0 chunks +bundling changes: 1 chunks +bundling changes: 2 chunks +bundling changes: 3 chunks +bundling changes: 4 chunks +bundling changes: 5 chunks +bundling changes: 6 chunks +bundling changes: 7 chunks +bundling changes: 8 chunks +bundling changes: 9 chunks +bundling manifests: 0 chunks +bundling manifests: 1 chunks +bundling manifests: 2 chunks +bundling manifests: 3 chunks +bundling manifests: 4 chunks +bundling manifests: 5 chunks +bundling manifests: 6 chunks +bundling manifests: 7 chunks +bundling manifests: 8 chunks +bundling manifests: 9 chunks +bundling files: foo/Bar/file.txt 0 chunks +bundling files: foo/Bar/file.txt 1 chunks +bundling files: foo/Bar/file.txt 2 chunks +bundling files: foo/Bar/file.txt 3 chunks +bundling files: foo/file.txt 4 chunks +bundling files: foo/file.txt 5 chunks +bundling files: foo/file.txt 6 chunks +bundling files: foo/file.txt 7 chunks +bundling files: quux/file.py 8 chunks +bundling files: quux/file.py 9 chunks +bundling files: quux/file.py 10 chunks +bundling files: quux/file.py 11 chunks changesets: 1 chunks add changeset ef1ea85a6374 changesets: 2 chunks @@ -406,38 +406,38 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets -bundle changes: 0 chunks -bundle changes: 1 chunks -bundle changes: 2 chunks -bundle changes: 3 chunks -bundle changes: 4 chunks -bundle changes: 5 chunks -bundle changes: 6 chunks -bundle changes: 7 chunks -bundle changes: 8 chunks -bundle changes: 9 chunks -bundle manifests: 0 chunks -bundle manifests: 1 chunks -bundle manifests: 2 chunks -bundle manifests: 3 chunks -bundle manifests: 4 chunks -bundle manifests: 5 chunks -bundle manifests: 6 chunks -bundle manifests: 7 chunks -bundle manifests: 8 chunks -bundle manifests: 9 chunks -bundle files: foo/Bar/file.txt 0 chunks -bundle files: foo/Bar/file.txt 1 chunks -bundle files: foo/Bar/file.txt 2 chunks -bundle files: foo/Bar/file.txt 3 chunks -bundle files: foo/file.txt 4 chunks -bundle files: foo/file.txt 5 chunks -bundle files: foo/file.txt 6 chunks -bundle files: foo/file.txt 7 chunks -bundle files: quux/file.py 8 chunks -bundle files: quux/file.py 9 chunks -bundle files: quux/file.py 10 chunks -bundle files: quux/file.py 11 chunks +bundling changes: 0 chunks +bundling changes: 1 chunks +bundling changes: 2 chunks +bundling changes: 3 chunks +bundling changes: 4 chunks +bundling changes: 5 chunks +bundling changes: 6 chunks +bundling changes: 7 chunks +bundling changes: 8 chunks +bundling changes: 9 chunks +bundling manifests: 0 chunks +bundling manifests: 1 chunks +bundling manifests: 2 chunks +bundling manifests: 3 chunks +bundling manifests: 4 chunks +bundling manifests: 5 chunks +bundling manifests: 6 chunks +bundling manifests: 7 chunks +bundling manifests: 8 chunks +bundling manifests: 9 chunks +bundling files: foo/Bar/file.txt 0 chunks +bundling files: foo/Bar/file.txt 1 chunks +bundling files: foo/Bar/file.txt 2 chunks +bundling files: foo/Bar/file.txt 3 chunks +bundling files: foo/file.txt 4 chunks +bundling files: foo/file.txt 5 chunks +bundling files: foo/file.txt 6 chunks +bundling files: foo/file.txt 7 chunks +bundling files: quux/file.py 8 chunks +bundling files: quux/file.py 9 chunks +bundling files: quux/file.py 10 chunks +bundling files: quux/file.py 11 chunks changesets: 1 chunks add changeset ef1ea85a6374 changesets: 2 chunks @@ -488,38 +488,38 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets -bundle changes: 0 chunks -bundle changes: 1 chunks -bundle changes: 2 chunks -bundle changes: 3 chunks -bundle changes: 4 chunks -bundle changes: 5 chunks -bundle changes: 6 chunks -bundle changes: 7 chunks -bundle changes: 8 chunks -bundle changes: 9 chunks -bundle manifests: 0 chunks -bundle manifests: 1 chunks -bundle manifests: 2 chunks -bundle manifests: 3 chunks -bundle manifests: 4 chunks -bundle manifests: 5 chunks -bundle manifests: 6 chunks -bundle manifests: 7 chunks -bundle manifests: 8 chunks -bundle manifests: 9 chunks -bundle files: foo/Bar/file.txt 0 chunks -bundle files: foo/Bar/file.txt 1 chunks -bundle files: foo/Bar/file.txt 2 chunks -bundle files: foo/Bar/file.txt 3 chunks -bundle files: foo/file.txt 4 chunks -bundle files: foo/file.txt 5 chunks -bundle files: foo/file.txt 6 chunks -bundle files: foo/file.txt 7 chunks -bundle files: quux/file.py 8 chunks -bundle files: quux/file.py 9 chunks -bundle files: quux/file.py 10 chunks -bundle files: quux/file.py 11 chunks +bundling changes: 0 chunks +bundling changes: 1 chunks +bundling changes: 2 chunks +bundling changes: 3 chunks +bundling changes: 4 chunks +bundling changes: 5 chunks +bundling changes: 6 chunks +bundling changes: 7 chunks +bundling changes: 8 chunks +bundling changes: 9 chunks +bundling manifests: 0 chunks +bundling manifests: 1 chunks +bundling manifests: 2 chunks +bundling manifests: 3 chunks +bundling manifests: 4 chunks +bundling manifests: 5 chunks +bundling manifests: 6 chunks +bundling manifests: 7 chunks +bundling manifests: 8 chunks +bundling manifests: 9 chunks +bundling files: foo/Bar/file.txt 0 chunks +bundling files: foo/Bar/file.txt 1 chunks +bundling files: foo/Bar/file.txt 2 chunks +bundling files: foo/Bar/file.txt 3 chunks +bundling files: foo/file.txt 4 chunks +bundling files: foo/file.txt 5 chunks +bundling files: foo/file.txt 6 chunks +bundling files: foo/file.txt 7 chunks +bundling files: quux/file.py 8 chunks +bundling files: quux/file.py 9 chunks +bundling files: quux/file.py 10 chunks +bundling files: quux/file.py 11 chunks changesets: 1 chunks add changeset ef1ea85a6374 changesets: 2 chunks @@ -573,38 +573,38 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets -bundle changes: 0 chunks -bundle changes: 1 chunks -bundle changes: 2 chunks -bundle changes: 3 chunks -bundle changes: 4 chunks -bundle changes: 5 chunks -bundle changes: 6 chunks -bundle changes: 7 chunks -bundle changes: 8 chunks -bundle changes: 9 chunks -bundle manifests: 0 chunks -bundle manifests: 1 chunks -bundle manifests: 2 chunks -bundle manifests: 3 chunks -bundle manifests: 4 chunks -bundle manifests: 5 chunks -bundle manifests: 6 chunks -bundle manifests: 7 chunks -bundle manifests: 8 chunks -bundle manifests: 9 chunks -bundle files: foo/Bar/file.txt 0 chunks -bundle files: foo/Bar/file.txt 1 chunks -bundle files: foo/Bar/file.txt 2 chunks -bundle files: foo/Bar/file.txt 3 chunks -bundle files: foo/file.txt 4 chunks -bundle files: foo/file.txt 5 chunks -bundle files: foo/file.txt 6 chunks -bundle files: foo/file.txt 7 chunks -bundle files: quux/file.py 8 chunks -bundle files: quux/file.py 9 chunks -bundle files: quux/file.py 10 chunks -bundle files: quux/file.py 11 chunks +bundling changes: 0 chunks +bundling changes: 1 chunks +bundling changes: 2 chunks +bundling changes: 3 chunks +bundling changes: 4 chunks +bundling changes: 5 chunks +bundling changes: 6 chunks +bundling changes: 7 chunks +bundling changes: 8 chunks +bundling changes: 9 chunks +bundling manifests: 0 chunks +bundling manifests: 1 chunks +bundling manifests: 2 chunks +bundling manifests: 3 chunks +bundling manifests: 4 chunks +bundling manifests: 5 chunks +bundling manifests: 6 chunks +bundling manifests: 7 chunks +bundling manifests: 8 chunks +bundling manifests: 9 chunks +bundling files: foo/Bar/file.txt 0 chunks +bundling files: foo/Bar/file.txt 1 chunks +bundling files: foo/Bar/file.txt 2 chunks +bundling files: foo/Bar/file.txt 3 chunks +bundling files: foo/file.txt 4 chunks +bundling files: foo/file.txt 5 chunks +bundling files: foo/file.txt 6 chunks +bundling files: foo/file.txt 7 chunks +bundling files: quux/file.py 8 chunks +bundling files: quux/file.py 9 chunks +bundling files: quux/file.py 10 chunks +bundling files: quux/file.py 11 chunks changesets: 1 chunks add changeset ef1ea85a6374 changesets: 2 chunks @@ -657,38 +657,38 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets -bundle changes: 0 chunks -bundle changes: 1 chunks -bundle changes: 2 chunks -bundle changes: 3 chunks -bundle changes: 4 chunks -bundle changes: 5 chunks -bundle changes: 6 chunks -bundle changes: 7 chunks -bundle changes: 8 chunks -bundle changes: 9 chunks -bundle manifests: 0 chunks -bundle manifests: 1 chunks -bundle manifests: 2 chunks -bundle manifests: 3 chunks -bundle manifests: 4 chunks -bundle manifests: 5 chunks -bundle manifests: 6 chunks -bundle manifests: 7 chunks -bundle manifests: 8 chunks -bundle manifests: 9 chunks -bundle files: foo/Bar/file.txt 0 chunks -bundle files: foo/Bar/file.txt 1 chunks -bundle files: foo/Bar/file.txt 2 chunks -bundle files: foo/Bar/file.txt 3 chunks -bundle files: foo/file.txt 4 chunks -bundle files: foo/file.txt 5 chunks -bundle files: foo/file.txt 6 chunks -bundle files: foo/file.txt 7 chunks -bundle files: quux/file.py 8 chunks -bundle files: quux/file.py 9 chunks -bundle files: quux/file.py 10 chunks -bundle files: quux/file.py 11 chunks +bundling changes: 0 chunks +bundling changes: 1 chunks +bundling changes: 2 chunks +bundling changes: 3 chunks +bundling changes: 4 chunks +bundling changes: 5 chunks +bundling changes: 6 chunks +bundling changes: 7 chunks +bundling changes: 8 chunks +bundling changes: 9 chunks +bundling manifests: 0 chunks +bundling manifests: 1 chunks +bundling manifests: 2 chunks +bundling manifests: 3 chunks +bundling manifests: 4 chunks +bundling manifests: 5 chunks +bundling manifests: 6 chunks +bundling manifests: 7 chunks +bundling manifests: 8 chunks +bundling manifests: 9 chunks +bundling files: foo/Bar/file.txt 0 chunks +bundling files: foo/Bar/file.txt 1 chunks +bundling files: foo/Bar/file.txt 2 chunks +bundling files: foo/Bar/file.txt 3 chunks +bundling files: foo/file.txt 4 chunks +bundling files: foo/file.txt 5 chunks +bundling files: foo/file.txt 6 chunks +bundling files: foo/file.txt 7 chunks +bundling files: quux/file.py 8 chunks +bundling files: quux/file.py 9 chunks +bundling files: quux/file.py 10 chunks +bundling files: quux/file.py 11 chunks changesets: 1 chunks add changeset ef1ea85a6374 changesets: 2 chunks @@ -742,38 +742,38 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets -bundle changes: 0 chunks -bundle changes: 1 chunks -bundle changes: 2 chunks -bundle changes: 3 chunks -bundle changes: 4 chunks -bundle changes: 5 chunks -bundle changes: 6 chunks -bundle changes: 7 chunks -bundle changes: 8 chunks -bundle changes: 9 chunks -bundle manifests: 0 chunks -bundle manifests: 1 chunks -bundle manifests: 2 chunks -bundle manifests: 3 chunks -bundle manifests: 4 chunks -bundle manifests: 5 chunks -bundle manifests: 6 chunks -bundle manifests: 7 chunks -bundle manifests: 8 chunks -bundle manifests: 9 chunks -bundle files: foo/Bar/file.txt 0 chunks -bundle files: foo/Bar/file.txt 1 chunks -bundle files: foo/Bar/file.txt 2 chunks -bundle files: foo/Bar/file.txt 3 chunks -bundle files: foo/file.txt 4 chunks -bundle files: foo/file.txt 5 chunks -bundle files: foo/file.txt 6 chunks -bundle files: foo/file.txt 7 chunks -bundle files: quux/file.py 8 chunks -bundle files: quux/file.py 9 chunks -bundle files: quux/file.py 10 chunks -bundle files: quux/file.py 11 chunks +bundling changes: 0 chunks +bundling changes: 1 chunks +bundling changes: 2 chunks +bundling changes: 3 chunks +bundling changes: 4 chunks +bundling changes: 5 chunks +bundling changes: 6 chunks +bundling changes: 7 chunks +bundling changes: 8 chunks +bundling changes: 9 chunks +bundling manifests: 0 chunks +bundling manifests: 1 chunks +bundling manifests: 2 chunks +bundling manifests: 3 chunks +bundling manifests: 4 chunks +bundling manifests: 5 chunks +bundling manifests: 6 chunks +bundling manifests: 7 chunks +bundling manifests: 8 chunks +bundling manifests: 9 chunks +bundling files: foo/Bar/file.txt 0 chunks +bundling files: foo/Bar/file.txt 1 chunks +bundling files: foo/Bar/file.txt 2 chunks +bundling files: foo/Bar/file.txt 3 chunks +bundling files: foo/file.txt 4 chunks +bundling files: foo/file.txt 5 chunks +bundling files: foo/file.txt 6 chunks +bundling files: foo/file.txt 7 chunks +bundling files: quux/file.py 8 chunks +bundling files: quux/file.py 9 chunks +bundling files: quux/file.py 10 chunks +bundling files: quux/file.py 11 chunks changesets: 1 chunks add changeset ef1ea85a6374 changesets: 2 chunks @@ -828,38 +828,38 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets -bundle changes: 0 chunks -bundle changes: 1 chunks -bundle changes: 2 chunks -bundle changes: 3 chunks -bundle changes: 4 chunks -bundle changes: 5 chunks -bundle changes: 6 chunks -bundle changes: 7 chunks -bundle changes: 8 chunks -bundle changes: 9 chunks -bundle manifests: 0 chunks -bundle manifests: 1 chunks -bundle manifests: 2 chunks -bundle manifests: 3 chunks -bundle manifests: 4 chunks -bundle manifests: 5 chunks -bundle manifests: 6 chunks -bundle manifests: 7 chunks -bundle manifests: 8 chunks -bundle manifests: 9 chunks -bundle files: foo/Bar/file.txt 0 chunks -bundle files: foo/Bar/file.txt 1 chunks -bundle files: foo/Bar/file.txt 2 chunks -bundle files: foo/Bar/file.txt 3 chunks -bundle files: foo/file.txt 4 chunks -bundle files: foo/file.txt 5 chunks -bundle files: foo/file.txt 6 chunks -bundle files: foo/file.txt 7 chunks -bundle files: quux/file.py 8 chunks -bundle files: quux/file.py 9 chunks -bundle files: quux/file.py 10 chunks -bundle files: quux/file.py 11 chunks +bundling changes: 0 chunks +bundling changes: 1 chunks +bundling changes: 2 chunks +bundling changes: 3 chunks +bundling changes: 4 chunks +bundling changes: 5 chunks +bundling changes: 6 chunks +bundling changes: 7 chunks +bundling changes: 8 chunks +bundling changes: 9 chunks +bundling manifests: 0 chunks +bundling manifests: 1 chunks +bundling manifests: 2 chunks +bundling manifests: 3 chunks +bundling manifests: 4 chunks +bundling manifests: 5 chunks +bundling manifests: 6 chunks +bundling manifests: 7 chunks +bundling manifests: 8 chunks +bundling manifests: 9 chunks +bundling files: foo/Bar/file.txt 0 chunks +bundling files: foo/Bar/file.txt 1 chunks +bundling files: foo/Bar/file.txt 2 chunks +bundling files: foo/Bar/file.txt 3 chunks +bundling files: foo/file.txt 4 chunks +bundling files: foo/file.txt 5 chunks +bundling files: foo/file.txt 6 chunks +bundling files: foo/file.txt 7 chunks +bundling files: quux/file.py 8 chunks +bundling files: quux/file.py 9 chunks +bundling files: quux/file.py 10 chunks +bundling files: quux/file.py 11 chunks changesets: 1 chunks add changeset ef1ea85a6374 changesets: 2 chunks @@ -918,38 +918,38 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets -bundle changes: 0 chunks -bundle changes: 1 chunks -bundle changes: 2 chunks -bundle changes: 3 chunks -bundle changes: 4 chunks -bundle changes: 5 chunks -bundle changes: 6 chunks -bundle changes: 7 chunks -bundle changes: 8 chunks -bundle changes: 9 chunks -bundle manifests: 0 chunks -bundle manifests: 1 chunks -bundle manifests: 2 chunks -bundle manifests: 3 chunks -bundle manifests: 4 chunks -bundle manifests: 5 chunks -bundle manifests: 6 chunks -bundle manifests: 7 chunks -bundle manifests: 8 chunks -bundle manifests: 9 chunks -bundle files: foo/Bar/file.txt 0 chunks -bundle files: foo/Bar/file.txt 1 chunks -bundle files: foo/Bar/file.txt 2 chunks -bundle files: foo/Bar/file.txt 3 chunks -bundle files: foo/file.txt 4 chunks -bundle files: foo/file.txt 5 chunks -bundle files: foo/file.txt 6 chunks -bundle files: foo/file.txt 7 chunks -bundle files: quux/file.py 8 chunks -bundle files: quux/file.py 9 chunks -bundle files: quux/file.py 10 chunks -bundle files: quux/file.py 11 chunks +bundling changes: 0 chunks +bundling changes: 1 chunks +bundling changes: 2 chunks +bundling changes: 3 chunks +bundling changes: 4 chunks +bundling changes: 5 chunks +bundling changes: 6 chunks +bundling changes: 7 chunks +bundling changes: 8 chunks +bundling changes: 9 chunks +bundling manifests: 0 chunks +bundling manifests: 1 chunks +bundling manifests: 2 chunks +bundling manifests: 3 chunks +bundling manifests: 4 chunks +bundling manifests: 5 chunks +bundling manifests: 6 chunks +bundling manifests: 7 chunks +bundling manifests: 8 chunks +bundling manifests: 9 chunks +bundling files: foo/Bar/file.txt 0 chunks +bundling files: foo/Bar/file.txt 1 chunks +bundling files: foo/Bar/file.txt 2 chunks +bundling files: foo/Bar/file.txt 3 chunks +bundling files: foo/file.txt 4 chunks +bundling files: foo/file.txt 5 chunks +bundling files: foo/file.txt 6 chunks +bundling files: foo/file.txt 7 chunks +bundling files: quux/file.py 8 chunks +bundling files: quux/file.py 9 chunks +bundling files: quux/file.py 10 chunks +bundling files: quux/file.py 11 chunks changesets: 1 chunks add changeset ef1ea85a6374 changesets: 2 chunks @@ -1007,38 +1007,38 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets -bundle changes: 0 chunks -bundle changes: 1 chunks -bundle changes: 2 chunks -bundle changes: 3 chunks -bundle changes: 4 chunks -bundle changes: 5 chunks -bundle changes: 6 chunks -bundle changes: 7 chunks -bundle changes: 8 chunks -bundle changes: 9 chunks -bundle manifests: 0 chunks -bundle manifests: 1 chunks -bundle manifests: 2 chunks -bundle manifests: 3 chunks -bundle manifests: 4 chunks -bundle manifests: 5 chunks -bundle manifests: 6 chunks -bundle manifests: 7 chunks -bundle manifests: 8 chunks -bundle manifests: 9 chunks -bundle files: foo/Bar/file.txt 0 chunks -bundle files: foo/Bar/file.txt 1 chunks -bundle files: foo/Bar/file.txt 2 chunks -bundle files: foo/Bar/file.txt 3 chunks -bundle files: foo/file.txt 4 chunks -bundle files: foo/file.txt 5 chunks -bundle files: foo/file.txt 6 chunks -bundle files: foo/file.txt 7 chunks -bundle files: quux/file.py 8 chunks -bundle files: quux/file.py 9 chunks -bundle files: quux/file.py 10 chunks -bundle files: quux/file.py 11 chunks +bundling changes: 0 chunks +bundling changes: 1 chunks +bundling changes: 2 chunks +bundling changes: 3 chunks +bundling changes: 4 chunks +bundling changes: 5 chunks +bundling changes: 6 chunks +bundling changes: 7 chunks +bundling changes: 8 chunks +bundling changes: 9 chunks +bundling manifests: 0 chunks +bundling manifests: 1 chunks +bundling manifests: 2 chunks +bundling manifests: 3 chunks +bundling manifests: 4 chunks +bundling manifests: 5 chunks +bundling manifests: 6 chunks +bundling manifests: 7 chunks +bundling manifests: 8 chunks +bundling manifests: 9 chunks +bundling files: foo/Bar/file.txt 0 chunks +bundling files: foo/Bar/file.txt 1 chunks +bundling files: foo/Bar/file.txt 2 chunks +bundling files: foo/Bar/file.txt 3 chunks +bundling files: foo/file.txt 4 chunks +bundling files: foo/file.txt 5 chunks +bundling files: foo/file.txt 6 chunks +bundling files: foo/file.txt 7 chunks +bundling files: quux/file.py 8 chunks +bundling files: quux/file.py 9 chunks +bundling files: quux/file.py 10 chunks +bundling files: quux/file.py 11 chunks changesets: 1 chunks add changeset ef1ea85a6374 changesets: 2 chunks @@ -1103,38 +1103,38 @@ f9cafe1212c8c6fa1120d14a556e18cc44ff8bdd 911600dab2ae7a9baff75958b84fe606851ce955 adding changesets -bundle changes: 0 chunks -bundle changes: 1 chunks -bundle changes: 2 chunks -bundle changes: 3 chunks -bundle changes: 4 chunks -bundle changes: 5 chunks -bundle changes: 6 chunks -bundle changes: 7 chunks -bundle changes: 8 chunks -bundle changes: 9 chunks -bundle manifests: 0 chunks -bundle manifests: 1 chunks -bundle manifests: 2 chunks -bundle manifests: 3 chunks -bundle manifests: 4 chunks -bundle manifests: 5 chunks -bundle manifests: 6 chunks -bundle manifests: 7 chunks -bundle manifests: 8 chunks -bundle manifests: 9 chunks -bundle files: foo/Bar/file.txt 0 chunks -bundle files: foo/Bar/file.txt 1 chunks -bundle files: foo/Bar/file.txt 2 chunks -bundle files: foo/Bar/file.txt 3 chunks -bundle files: foo/file.txt 4 chunks -bundle files: foo/file.txt 5 chunks -bundle files: foo/file.txt 6 chunks -bundle files: foo/file.txt 7 chunks -bundle files: quux/file.py 8 chunks -bundle files: quux/file.py 9 chunks -bundle files: quux/file.py 10 chunks -bundle files: quux/file.py 11 chunks +bundling changes: 0 chunks +bundling changes: 1 chunks +bundling changes: 2 chunks +bundling changes: 3 chunks +bundling changes: 4 chunks +bundling changes: 5 chunks +bundling changes: 6 chunks +bundling changes: 7 chunks +bundling changes: 8 chunks +bundling changes: 9 chunks +bundling manifests: 0 chunks +bundling manifests: 1 chunks +bundling manifests: 2 chunks +bundling manifests: 3 chunks +bundling manifests: 4 chunks +bundling manifests: 5 chunks +bundling manifests: 6 chunks +bundling manifests: 7 chunks +bundling manifests: 8 chunks +bundling manifests: 9 chunks +bundling files: foo/Bar/file.txt 0 chunks +bundling files: foo/Bar/file.txt 1 chunks +bundling files: foo/Bar/file.txt 2 chunks +bundling files: foo/Bar/file.txt 3 chunks +bundling files: foo/file.txt 4 chunks +bundling files: foo/file.txt 5 chunks +bundling files: foo/file.txt 6 chunks +bundling files: foo/file.txt 7 chunks +bundling files: quux/file.py 8 chunks +bundling files: quux/file.py 9 chunks +bundling files: quux/file.py 10 chunks +bundling files: quux/file.py 11 chunks changesets: 1 chunks add changeset ef1ea85a6374 changesets: 2 chunks diff -r 28e9a9907236 -r 7b0a0d498cc0 tests/test-bundle.out --- a/tests/test-bundle.out Sun Mar 14 23:18:50 2010 +0100 +++ b/tests/test-bundle.out Mon Mar 15 18:36:11 2010 +0100 @@ -341,25 +341,25 @@ list of changesets: d2ae7f538514cd87c17547b0de4cea71fe1af9fb 5ece8e77363e2b5269e27c66828b72da29e4341a -bundle changes: 0 chunks -bundle changes: 1 chunks -bundle changes: 2 chunks -bundle changes: 3 chunks -bundle changes: 4 chunks -bundle changes: 5 chunks -bundle changes: 6 chunks -bundle manifests: 0 chunks -bundle manifests: 1 chunks -bundle manifests: 2 chunks -bundle manifests: 3 chunks -bundle manifests: 4 chunks -bundle manifests: 5 chunks -bundle manifests: 6 chunks -bundle files: b 0 chunks -bundle files: b 1 chunks -bundle files: b 2 chunks -bundle files: b 3 chunks -bundle files: b1 4 chunks -bundle files: b1 5 chunks -bundle files: b1 6 chunks -bundle files: b1 7 chunks +bundling changes: 0 chunks +bundling changes: 1 chunks +bundling changes: 2 chunks +bundling changes: 3 chunks +bundling changes: 4 chunks +bundling changes: 5 chunks +bundling changes: 6 chunks +bundling manifests: 0 chunks +bundling manifests: 1 chunks +bundling manifests: 2 chunks +bundling manifests: 3 chunks +bundling manifests: 4 chunks +bundling manifests: 5 chunks +bundling manifests: 6 chunks +bundling files: b 0 chunks +bundling files: b 1 chunks +bundling files: b 2 chunks +bundling files: b 3 chunks +bundling files: b1 4 chunks +bundling files: b1 5 chunks +bundling files: b1 6 chunks +bundling files: b1 7 chunks diff -r 28e9a9907236 -r 7b0a0d498cc0 tests/test-relink.out --- a/tests/test-relink.out Sun Mar 14 23:18:50 2010 +0100 +++ b/tests/test-relink.out Mon Mar 15 18:36:11 2010 +0100 @@ -17,7 +17,7 @@ not linkable: 00manifest.i not linkable: data/b.i pruned down to 2 probably relinkable files -relink: data/a.i 1/2 files (50.00%) +relinking: data/a.i 1/2 files (50.00%) not linkable: data/dummy.i relinked 1 files (136 bytes reclaimed) % check hardlinks diff -r 28e9a9907236 -r 7b0a0d498cc0 tests/test-subrepo.out --- a/tests/test-subrepo.out Sun Mar 14 23:18:50 2010 +0100 +++ b/tests/test-subrepo.out Mon Mar 15 18:36:11 2010 +0100 @@ -263,6 +263,6 @@ updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved [paths] -default = $HGTMP/test-subrepo/sub/mercurial/main/nested_absolute +default = $HGTMP/test-subrepo/sub/mercurial/nested_absolute [paths] -default = $HGTMP/test-subrepo/sub/mercurial/main/nested_relative +default = $HGTMP/test-subrepo/sub/mercurial/main/../nested_relative