[merge] update --revision
Kent Gibson
warthog618 at gmail.com
Wed Dec 13 13:58:29 GMT 2006
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
What is the state of this patch?
It seems to have dropped off the radar.
Cheers,
Kent.
Matthieu Moy wrote:
> Matthieu Moy <Matthieu.Moy at imag.fr> writes:
>
>> Attached is an updated bundle (just merged from upstream, without
>> conflict).
>
> Err, *this* one should be up to date with upstream (resolving one
> trivial conflict).
>
>
> ----------------------------------------------------------------------
>
> # Bazaar revision bundle v0.8
> #
> # message:
> # merge from upstream
> # committer: Matthieu Moy <Matthieu.Moy at imag.fr>
> # date: Wed 2006-09-27 15:36:48.111000061 +0200
>
> === modified file bzrlib/builtins.py
> --- bzrlib/builtins.py
> +++ bzrlib/builtins.py
> @@ -46,7 +46,7 @@
> from bzrlib.errors import (BzrError, BzrCheckError, BzrCommandError,
> NotBranchError, DivergedBranches,
NotConflicted,
> NoSuchFile, NoWorkingTree, FileInWrongBranch,
> - NotVersionedError, NotABundle)
> + NotVersionedError, NotABundle,
InvalidRevisionSpec)
> from bzrlib.merge import Merge3Merger
> from bzrlib.option import Option
> from bzrlib.progress import DummyProgress, ProgressPhase
> @@ -845,23 +845,43 @@
> 'bzr revert' instead of 'bzr commit' after the update.
> """
> takes_args = ['dir?']
> + takes_options = ['revision']
> aliases = ['up']
>
> - def run(self, dir='.'):
> + def run(self, dir='.', revision=None):
> + if revision is not None and len(revision) != 1:
> + raise BzrCommandError("bzr update --revision takes exactly
one revision")
> tree = WorkingTree.open_containing(dir)[0]
> + branch = tree.branch
> tree.lock_write()
> try:
> existing_pending_merges = tree.get_parent_ids()[1:]
> - last_rev = tree.last_revision()
> - if last_rev == tree.branch.last_revision():
> - # may be up to date, check master too.
> - master = tree.branch.get_master_branch()
> - if master is None or last_rev == master.last_revision():
> - revno = tree.branch.revision_id_to_revno(last_rev)
> - note("Tree is up to date at revision %d." % (revno,))
> - return 0
> - conflicts = tree.update()
> - revno = tree.branch.revision_id_to_revno(tree.last_revision())
> + # potentially get new revisions from the master branch.
> + # needed for the case where -r N is given, with N not yet
> + # in the local branch for a heavyweight checkout.
> + if revision is not None:
> + try:
> + rev = revision[0].in_history(branch).rev_id
> + # no need to run branch.update()
> + old_tip = None
> + except (errors.NoSuchRevision,
errors.InvalidRevisionSpec):
> + # revision was not there, but is maybe in the master.
> + old_tip = branch.update()
> + rev = revision[0].in_history(branch).rev_id
> + else:
> + old_tip = branch.update()
> + rev = branch.last_revision()
> + if tree.last_revision() == rev:
> + revno = branch.revision_id_to_revno(rev)
> + note("Tree is up to date at revision %d." % (revno,))
> + return 0
> + try:
> + conflicts = tree.update(rev, old_tip)
> + except errors.NoSuchRevision, e:
> + raise BzrCommandError("branch has no revision %s\n"
> + "bzr update --revision works
only for a revision in the branch history"
> + % (e.revision))
> + revno = branch.revision_id_to_revno(tree.last_revision())
> note('Updated to revision %d.' % (revno,))
> if tree.get_parent_ids()[1:] != existing_pending_merges:
> note('Your local commits will now show as pending
merges with '
>
> === modified file bzrlib/tests/blackbox/test_update.py //
last-changed:Matthieu
> ... .Moy at imag.fr-20060902121702-5a0c8b684bd58a57
> --- bzrlib/tests/blackbox/test_update.py
> +++ bzrlib/tests/blackbox/test_update.py
> @@ -197,3 +197,73 @@
>
> # The pending merges should still be there
> self.assertEqual(['o2'], checkout1.get_parent_ids()[1:])
> +
> + def test_update_dash_r(self):
> + # Test that 'bzr update' works correctly when you have
> + # an update in the master tree, and a lightweight checkout
> + # which has merged another branch
> + master = self.make_branch_and_tree('master')
> + os.chdir('master')
> + self.build_tree(['./file1'])
> + master.add(['file1'])
> + master.commit('one', rev_id='m1')
> + self.build_tree(['./file2'])
> + master.add(['file2'])
> + master.commit('two', rev_id='m2')
> +
> + out, err = self.run_bzr('update', '-r', '1')
> + self.assertEqual('', out)
> + self.assertEqual('All changes applied successfully.\n'
> + 'Updated to revision 1.\n', err)
> + self.failUnlessExists('./file1')
> + self.failIfExists('./file2')
> + self.check_file_contents('.bzr/checkout/last-revision',
> + 'm1')
> +
> + def test_update_dash_r_outside_history(self):
> + # Test that 'bzr update' works correctly when you have
> + # an update in the master tree, and a lightweight checkout
> + # which has merged another branch
> + master = self.make_branch_and_tree('master')
> + self.build_tree(['master/file1'])
> + master.add(['file1'])
> + master.commit('one', rev_id='m1')
> +
> + # Create a second branch, with an extra commit
> + other = master.bzrdir.sprout('other').open_workingtree()
> + self.build_tree(['other/file2'])
> + other.add(['file2'])
> + other.commit('other2', rev_id='o2')
> +
> + os.chdir('master')
> + self.run_bzr('merge', '../other')
> + master.commit('merge', rev_id='merge')
> +
> + out, err = self.run_bzr('update', '-r', 'revid:o2',
> + retcode=3)
> + self.assertEqual('', out)
> + self.assertEqual('bzr: ERROR: branch has no revision o2\n'
> + 'bzr update --revision works only'
> + ' for a revision in the branch history\n',
> + err)
> +
> + def test_update_dash_r_in_master(self):
> + # Test that 'bzr update' works correctly when you have
> + # an update in the master tree,
> + master = self.make_branch_and_tree('master')
> + self.build_tree(['master/file1'])
> + master.add(['file1'])
> + master.commit('one', rev_id='m1')
> +
> + self.run_bzr('checkout', 'master', 'checkout')
> +
> + # add a revision in the master.
> + self.build_tree(['master/file2'])
> + master.add(['file2'])
> + master.commit('two', rev_id='m2')
> +
> + os.chdir('checkout')
> + out, err = self.run_bzr('update', '-r', 'revid:m2')
> + self.assertEqual('', out)
> + self.assertEqual('All changes applied successfully.\n'
> + 'Updated to revision 2.\n', err)
>
> === modified file bzrlib/workingtree.py
> --- bzrlib/workingtree.py
> +++ bzrlib/workingtree.py
> @@ -1575,8 +1575,10 @@
> """
> raise NotImplementedError(self.unlock)
>
> + _marker = object()
> +
> @needs_write_lock
> - def update(self):
> + def update(self, revision=None, old_tip=_marker):
> """Update a working tree along its branch.
>
> This will update the branch if its bound too, which means we
have multiple trees involved:
> @@ -1594,8 +1596,13 @@
> There isn't a single operation at the moment to do that, so we:
> Merge current state -> basis tree of the master w.r.t. the old
tree basis.
> Do a 'normal' merge of the old branch basis if it is relevant.
> +
> + :param revision: The target revision to update to. Must be in
the revision history.
> + :param old_tip: If branch.update() has already been run, the
value it returned
> + (old tip of the branch or None). _marker is used otherwise.
> """
> - old_tip = self.branch.update()
> + if old_tip == self._marker:
> + old_tip = self.branch.update()
> # here if old_tip is not None, it is the old tip of the branch
before
> # it was updated from the master branch. This should become a
pending
> # merge in the working tree to preserve the user existing
work. we
> @@ -1611,20 +1618,26 @@
> last_rev = self.get_parent_ids()[0]
> except IndexError:
> last_rev = None
> - if last_rev != self.branch.last_revision():
> + if revision is None:
> + revision = self.branch.last_revision()
> + else:
> + if revision not in self.branch.revision_history():
> + raise errors.NoSuchRevision(self.branch, revision)
> + if last_rev != revision:
> # merge tree state up to new branch tip.
> basis = self.basis_tree()
> - to_tree = self.branch.basis_tree()
> + to_tree = self.branch.repository.revision_tree(revision)
> result += merge_inner(self.branch,
> to_tree,
> basis,
> this_tree=self)
> + self.set_last_revision(revision)
> # TODO - dedup parents list with things merged by pull ?
> # reuse the tree we've updated to to set the basis:
> - parent_trees = [(self.branch.last_revision(), to_tree)]
> + parent_trees = [(revision, to_tree)]
> merges = self.get_parent_ids()[1:]
> # Ideally we ask the tree for the trees here, that way the
working
> - # tree can decide whether to give us teh entire tree or
give us a
> + # tree can decide whether to give us the entire tree or
give us a
> # lazy initialised tree. dirstate for instance will have
the trees
> # in ram already, whereas a last-revision +
basis-inventory tree
> # will not, but also does not need them when setting parents.
> @@ -1649,7 +1662,7 @@
> # and the now pending merge
> from bzrlib.revision import common_ancestor
> try:
> - base_rev_id = common_ancestor(self.branch.last_revision(),
> + base_rev_id = common_ancestor(revision,
> old_tip,
> self.branch.repository)
> except errors.NoCommonAncestor:
>
> # revision id: Matthieu.Moy at imag.fr-20060927133648-f0307b1eefd0767b
> # sha1: c379e21b046100bcc8f1476ece2941238761445c
> # inventory sha1: b8448f4833d3270ce5668cd88019ecfd7cb18e50
> # parent ids:
> # Matthieu.Moy at imag.fr-20060927132040-6cdca203f2f35e81
> # pqm at pqm.ubuntu.com-20060926233056-203e713964b2cd51
> # base id: pqm at pqm.ubuntu.com-20060926233056-203e713964b2cd51
> # properties:
> # branch-nick: bzr.update-r
>
> # message:
> # merged from upstream
> # committer: Matthieu Moy <Matthieu.Moy at imag.fr>
> # date: Wed 2006-09-27 15:20:40.542000055 +0200
>
> === modified file bzrlib/builtins.py // encoding:base64
> LS0tIGJ6cmxpYi9idWlsdGlucy5weQorKysgYnpybGliL2J1aWx0aW5zLnB5CkBAIC00Niw3ICs0
> Niw3IEBACiBmcm9tIGJ6cmxpYi5lcnJvcnMgaW1wb3J0IChCenJFcnJvciwgQnpyQ2hlY2tFcnJv
> ciwgQnpyQ29tbWFuZEVycm9yLCAKICAgICAgICAgICAgICAgICAgICAgICAgICAgIE5vdEJyYW5j
> aEVycm9yLCBEaXZlcmdlZEJyYW5jaGVzLCBOb3RDb25mbGljdGVkLAogICAgICAgICAgICAgICAg
> ICAgICAgICAgICAgTm9TdWNoRmlsZSwgTm9Xb3JraW5nVHJlZSwgRmlsZUluV3JvbmdCcmFuY2gs
> Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICBOb3RWZXJzaW9uZWRFcnJvciwgTm90QUJ1bmRs
> ZSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIE5vdFZlcnNpb25lZEVycm9yLCBOb3RBQnVu
> ZGxlLCBJbnZhbGlkUmV2aXNpb25TcGVjKQogZnJvbSBienJsaWIubWVyZ2UgaW1wb3J0IE1lcmdl
> M01lcmdlcgogZnJvbSBienJsaWIub3B0aW9uIGltcG9ydCBPcHRpb24KIGZyb20gYnpybGliLnBy
> b2dyZXNzIGltcG9ydCBEdW1teVByb2dyZXNzLCBQcm9ncmVzc1BoYXNlCkBAIC04MjEsMjUgKzgy
> MSw0NSBAQAogICAgICdienIgcmV2ZXJ0JyBpbnN0ZWFkIG9mICdienIgY29tbWl0JyBhZnRlciB0
> aGUgdXBkYXRlLgogICAgICIiIgogICAgIHRha2VzX2FyZ3MgPSBbJ2Rpcj8nXQorICAgIHRha2Vz
> X29wdGlvbnMgPSBbJ3JldmlzaW9uJ10KICAgICBhbGlhc2VzID0gWyd1cCddCiAKLSAgICBkZWYg
> cnVuKHNlbGYsIGRpcj0nLicpOgorICAgIGRlZiBydW4oc2VsZiwgZGlyPScuJywgcmV2aXNpb249
> Tm9uZSk6CisgICAgICAgIGlmIHJldmlzaW9uIGlzIG5vdCBOb25lIGFuZCBsZW4ocmV2aXNpb24p
> ICE9IDE6CisgICAgICAgICAgICByYWlzZSBCenJDb21tYW5kRXJyb3IoImJ6ciB1cGRhdGUgLS1y
> ZXZpc2lvbiB0YWtlcyBleGFjdGx5IG9uZSByZXZpc2lvbiIpCiAgICAgICAgIHRyZWUgPSBXb3Jr
> aW5nVHJlZS5vcGVuX2NvbnRhaW5pbmcoZGlyKVswXQorICAgICAgICBicmFuY2ggPSB0cmVlLmJy
> YW5jaAogICAgICAgICB0cmVlLmxvY2tfd3JpdGUoKQogICAgICAgICB0cnk6Ci0gICAgICAgICAg
> ICBleGlzdGluZ19wZW5kaW5nX21lcmdlcyA9IHRyZWUucGVuZGluZ19tZXJnZXMoKQotICAgICAg
> ICAgICAgbGFzdF9yZXYgPSB0cmVlLmxhc3RfcmV2aXNpb24oKQotICAgICAgICAgICAgaWYgbGFz
> dF9yZXYgPT0gdHJlZS5icmFuY2gubGFzdF9yZXZpc2lvbigpOgotICAgICAgICAgICAgICAgICMg
> bWF5IGJlIHVwIHRvIGRhdGUsIGNoZWNrIG1hc3RlciB0b28uCi0gICAgICAgICAgICAgICAgbWFz
> dGVyID0gdHJlZS5icmFuY2guZ2V0X21hc3Rlcl9icmFuY2goKQotICAgICAgICAgICAgICAgIGlm
> IG1hc3RlciBpcyBOb25lIG9yIGxhc3RfcmV2ID09IG1hc3Rlci5sYXN0X3JldmlzaW9uKCk6Ci0g
> ICAgICAgICAgICAgICAgICAgIHJldm5vID0gdHJlZS5icmFuY2gucmV2aXNpb25faWRfdG9fcmV2
> bm8obGFzdF9yZXYpCi0gICAgICAgICAgICAgICAgICAgIG5vdGUoIlRyZWUgaXMgdXAgdG8gZGF0
> ZSBhdCByZXZpc2lvbiAlZC4iICUgKHJldm5vLCkpCi0gICAgICAgICAgICAgICAgICAgIHJldHVy
> biAwCi0gICAgICAgICAgICBjb25mbGljdHMgPSB0cmVlLnVwZGF0ZSgpCi0gICAgICAgICAgICBy
> ZXZubyA9IHRyZWUuYnJhbmNoLnJldmlzaW9uX2lkX3RvX3Jldm5vKHRyZWUubGFzdF9yZXZpc2lv
> bigpKQorICAgICAgICAgICAgZXhpc3RpbmdfcGVuZGluZ19tZXJnZXMgPSB0cmVlLmdldF9wYXJl
> bnRfaWRzKClbMTpdCisgICAgICAgICAgICAjIHBvdGVudGlhbGx5IGdldCBuZXcgcmV2aXNpb25z
> IGZyb20gdGhlIG1hc3RlciBicmFuY2guCisgICAgICAgICAgICAjIG5lZWRlZCBmb3IgdGhlIGNh
> c2Ugd2hlcmUgLXIgTiBpcyBnaXZlbiwgd2l0aCBOIG5vdCB5ZXQKKyAgICAgICAgICAgICMgaW4g
> dGhlIGxvY2FsIGJyYW5jaCBmb3IgYSBoZWF2eXdlaWdodCBjaGVja291dC4KKyAgICAgICAgICAg
> IGlmIHJldmlzaW9uIGlzIG5vdCBOb25lOgorICAgICAgICAgICAgICAgIHRyeToKKyAgICAgICAg
> ICAgICAgICAgICAgcmV2ID0gcmV2aXNpb25bMF0uaW5faGlzdG9yeShicmFuY2gpLnJldl9pZAor
> ICAgICAgICAgICAgICAgICAgICAjIG5vIG5lZWQgdG8gcnVuIGJyYW5jaC51cGRhdGUoKQorICAg
> ICAgICAgICAgICAgICAgICBvbGRfdGlwID0gTm9uZQorICAgICAgICAgICAgICAgIGV4Y2VwdCAo
> ZXJyb3JzLk5vU3VjaFJldmlzaW9uLCBlcnJvcnMuSW52YWxpZFJldmlzaW9uU3BlYyk6CisgICAg
> ICAgICAgICAgICAgICAgICMgcmV2aXNpb24gd2FzIG5vdCB0aGVyZSwgYnV0IGlzIG1heWJlIGlu
> IHRoZSBtYXN0ZXIuCisgICAgICAgICAgICAgICAgICAgIG9sZF90aXAgPSBicmFuY2gudXBkYXRl
> KCkKKyAgICAgICAgICAgICAgICAgICAgcmV2ID0gcmV2aXNpb25bMF0uaW5faGlzdG9yeShicmFu
> Y2gpLnJldl9pZAorICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICBvbGRfdGlwID0g
> YnJhbmNoLnVwZGF0ZSgpCisgICAgICAgICAgICAgICAgcmV2ID0gYnJhbmNoLmxhc3RfcmV2aXNp
> b24oKQorICAgICAgICAgICAgaWYgdHJlZS5sYXN0X3JldmlzaW9uKCkgPT0gcmV2OgorICAgICAg
> ICAgICAgICAgIHJldm5vID0gYnJhbmNoLnJldmlzaW9uX2lkX3RvX3Jldm5vKHJldikKKyAgICAg
> ICAgICAgICAgICBub3RlKCJUcmVlIGlzIHVwIHRvIGRhdGUgYXQgcmV2aXNpb24gJWQuIiAlIChy
> ZXZubywpKQorICAgICAgICAgICAgICAgIHJldHVybiAwCisgICAgICAgICAgICB0cnk6CisgICAg
> ICAgICAgICAgICAgY29uZmxpY3RzID0gdHJlZS51cGRhdGUocmV2LCBvbGRfdGlwKQorICAgICAg
> ICAgICAgZXhjZXB0IGVycm9ycy5Ob1N1Y2hSZXZpc2lvbiwgZToKKyAgICAgICAgICAgICAgICBy
> YWlzZSBCenJDb21tYW5kRXJyb3IoImJyYW5jaCBoYXMgbm8gcmV2aXNpb24gJXNcbiIKKyAgICAg
> ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgImJ6ciB1cGRhdGUgLS1yZXZpc2lvbiB3
> b3JrcyBvbmx5IGZvciBhIHJldmlzaW9uIGluIHRoZSBicmFuY2ggaGlzdG9yeSIKKyAgICAgICAg
> ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJSAoZS5yZXZpc2lvbikpCisgICAgICAgICAg
> ICByZXZubyA9IGJyYW5jaC5yZXZpc2lvbl9pZF90b19yZXZubyh0cmVlLmxhc3RfcmV2aXNpb24o
> KSkKICAgICAgICAgICAgIG5vdGUoJ1VwZGF0ZWQgdG8gcmV2aXNpb24gJWQuJyAlIChyZXZubywp
> KQotICAgICAgICAgICAgaWYgdHJlZS5wZW5kaW5nX21lcmdlcygpICE9IGV4aXN0aW5nX3BlbmRp
> bmdfbWVyZ2VzOgorICAgICAgICAgICAgaWYgdHJlZS5nZXRfcGFyZW50X2lkcygpWzE6XSAhPSBl
> eGlzdGluZ19wZW5kaW5nX21lcmdlczoKICAgICAgICAgICAgICAgICBub3RlKCdZb3VyIGxvY2Fs
> IGNvbW1pdHMgd2lsbCBub3cgc2hvdyBhcyBwZW5kaW5nIG1lcmdlcyB3aXRoICcKICAgICAgICAg
> ICAgICAgICAgICAgICInYnpyIHN0YXR1cycsIGFuZCBjYW4gYmUgY29tbWl0dGVkIHdpdGggJ2J6
> ciBjb21taXQnLiIpCiAgICAgICAgICAgICBpZiBjb25mbGljdHMgIT0gMDoKCg==
>
> === modified file bzrlib/tests/blackbox/test_update.py //
last-changed:Matthieu
> ... .Moy at imag.fr-20060902121702-5a0c8b684bd58a57 // encoding:base64
> LS0tIGJ6cmxpYi90ZXN0cy9ibGFja2JveC90ZXN0X3VwZGF0ZS5weQorKysgYnpybGliL3Rlc3Rz
> L2JsYWNrYm94L3Rlc3RfdXBkYXRlLnB5CkBAIC0xOTcsMyArMTk3LDczIEBACiAKICAgICAgICAg
> IyBUaGUgcGVuZGluZyBtZXJnZXMgc2hvdWxkIHN0aWxsIGJlIHRoZXJlCiAgICAgICAgIHNlbGYu
> YXNzZXJ0RXF1YWwoWydvMiddLCBjaGVja291dDEuZ2V0X3BhcmVudF9pZHMoKVsxOl0pCisKKyAg
> ICBkZWYgdGVzdF91cGRhdGVfZGFzaF9yKHNlbGYpOgorICAgICAgICAjIFRlc3QgdGhhdCAnYnpy
> IHVwZGF0ZScgd29ya3MgY29ycmVjdGx5IHdoZW4geW91IGhhdmUKKyAgICAgICAgIyBhbiB1cGRh
> dGUgaW4gdGhlIG1hc3RlciB0cmVlLCBhbmQgYSBsaWdodHdlaWdodCBjaGVja291dAorICAgICAg
> ICAjIHdoaWNoIGhhcyBtZXJnZWQgYW5vdGhlciBicmFuY2gKKyAgICAgICAgbWFzdGVyID0gc2Vs
> Zi5tYWtlX2JyYW5jaF9hbmRfdHJlZSgnbWFzdGVyJykKKyAgICAgICAgb3MuY2hkaXIoJ21hc3Rl
> cicpCisgICAgICAgIHNlbGYuYnVpbGRfdHJlZShbJy4vZmlsZTEnXSkKKyAgICAgICAgbWFzdGVy
> LmFkZChbJ2ZpbGUxJ10pCisgICAgICAgIG1hc3Rlci5jb21taXQoJ29uZScsIHJldl9pZD0nbTEn
> KQorICAgICAgICBzZWxmLmJ1aWxkX3RyZWUoWycuL2ZpbGUyJ10pCisgICAgICAgIG1hc3Rlci5h
> ZGQoWydmaWxlMiddKQorICAgICAgICBtYXN0ZXIuY29tbWl0KCd0d28nLCByZXZfaWQ9J20yJykK
> KyAgICAgICAgCisgICAgICAgIG91dCwgZXJyID0gc2VsZi5ydW5fYnpyKCd1cGRhdGUnLCAnLXIn
> LCAnMScpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJycsIG91dCkKKyAgICAgICAgc2VsZi5h
> c3NlcnRFcXVhbCgnQWxsIGNoYW5nZXMgYXBwbGllZCBzdWNjZXNzZnVsbHkuXG4nCisgICAgICAg
> ICAgICAgICAgICAgICAgICAgJ1VwZGF0ZWQgdG8gcmV2aXNpb24gMS5cbicsIGVycikKKyAgICAg
> ICAgc2VsZi5mYWlsVW5sZXNzRXhpc3RzKCcuL2ZpbGUxJykKKyAgICAgICAgc2VsZi5mYWlsSWZF
> eGlzdHMoJy4vZmlsZTInKQorICAgICAgICBzZWxmLmNoZWNrX2ZpbGVfY29udGVudHMoJy5ienIv
> Y2hlY2tvdXQvbGFzdC1yZXZpc2lvbicsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
> ICAnbTEnKQorCisgICAgZGVmIHRlc3RfdXBkYXRlX2Rhc2hfcl9vdXRzaWRlX2hpc3Rvcnkoc2Vs
> Zik6CisgICAgICAgICMgVGVzdCB0aGF0ICdienIgdXBkYXRlJyB3b3JrcyBjb3JyZWN0bHkgd2hl
> biB5b3UgaGF2ZQorICAgICAgICAjIGFuIHVwZGF0ZSBpbiB0aGUgbWFzdGVyIHRyZWUsIGFuZCBh
> IGxpZ2h0d2VpZ2h0IGNoZWNrb3V0CisgICAgICAgICMgd2hpY2ggaGFzIG1lcmdlZCBhbm90aGVy
> IGJyYW5jaAorICAgICAgICBtYXN0ZXIgPSBzZWxmLm1ha2VfYnJhbmNoX2FuZF90cmVlKCdtYXN0
> ZXInKQorICAgICAgICBzZWxmLmJ1aWxkX3RyZWUoWydtYXN0ZXIvZmlsZTEnXSkKKyAgICAgICAg
> bWFzdGVyLmFkZChbJ2ZpbGUxJ10pCisgICAgICAgIG1hc3Rlci5jb21taXQoJ29uZScsIHJldl9p
> ZD0nbTEnKQorCisgICAgICAgICMgQ3JlYXRlIGEgc2Vjb25kIGJyYW5jaCwgd2l0aCBhbiBleHRy
> YSBjb21taXQKKyAgICAgICAgb3RoZXIgPSBtYXN0ZXIuYnpyZGlyLnNwcm91dCgnb3RoZXInKS5v
> cGVuX3dvcmtpbmd0cmVlKCkKKyAgICAgICAgc2VsZi5idWlsZF90cmVlKFsnb3RoZXIvZmlsZTIn
> XSkKKyAgICAgICAgb3RoZXIuYWRkKFsnZmlsZTInXSkKKyAgICAgICAgb3RoZXIuY29tbWl0KCdv
> dGhlcjInLCByZXZfaWQ9J28yJykKKworICAgICAgICBvcy5jaGRpcignbWFzdGVyJykKKyAgICAg
> ICAgc2VsZi5ydW5fYnpyKCdtZXJnZScsICcuLi9vdGhlcicpCisgICAgICAgIG1hc3Rlci5jb21t
> aXQoJ21lcmdlJywgcmV2X2lkPSdtZXJnZScpCisKKyAgICAgICAgb3V0LCBlcnIgPSBzZWxmLnJ1
> bl9ienIoJ3VwZGF0ZScsICctcicsICdyZXZpZDpvMicsCisgICAgICAgICAgICAgICAgICAgICAg
> ICAgICAgICAgIHJldGNvZGU9MykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnJywgb3V0KQor
> ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCdienI6IEVSUk9SOiBicmFuY2ggaGFzIG5vIHJldmlz
> aW9uIG8yXG4nCisgICAgICAgICAgICAgICAgICAgICAgICAgJ2J6ciB1cGRhdGUgLS1yZXZpc2lv
> biB3b3JrcyBvbmx5JworICAgICAgICAgICAgICAgICAgICAgICAgICcgZm9yIGEgcmV2aXNpb24g
> aW4gdGhlIGJyYW5jaCBoaXN0b3J5XG4nLAorICAgICAgICAgICAgICAgICAgICAgICAgIGVycikK
> KworICAgIGRlZiB0ZXN0X3VwZGF0ZV9kYXNoX3JfaW5fbWFzdGVyKHNlbGYpOgorICAgICAgICAj
> IFRlc3QgdGhhdCAnYnpyIHVwZGF0ZScgd29ya3MgY29ycmVjdGx5IHdoZW4geW91IGhhdmUKKyAg
> ICAgICAgIyBhbiB1cGRhdGUgaW4gdGhlIG1hc3RlciB0cmVlLAorICAgICAgICBtYXN0ZXIgPSBz
> ZWxmLm1ha2VfYnJhbmNoX2FuZF90cmVlKCdtYXN0ZXInKQorICAgICAgICBzZWxmLmJ1aWxkX3Ry
> ZWUoWydtYXN0ZXIvZmlsZTEnXSkKKyAgICAgICAgbWFzdGVyLmFkZChbJ2ZpbGUxJ10pCisgICAg
> ICAgIG1hc3Rlci5jb21taXQoJ29uZScsIHJldl9pZD0nbTEnKQorCisgICAgICAgIHNlbGYucnVu
> X2J6cignY2hlY2tvdXQnLCAnbWFzdGVyJywgJ2NoZWNrb3V0JykKKworICAgICAgICAjIGFkZCBh
> IHJldmlzaW9uIGluIHRoZSBtYXN0ZXIuCisgICAgICAgIHNlbGYuYnVpbGRfdHJlZShbJ21hc3Rl
> ci9maWxlMiddKQorICAgICAgICBtYXN0ZXIuYWRkKFsnZmlsZTInXSkKKyAgICAgICAgbWFzdGVy
> LmNvbW1pdCgndHdvJywgcmV2X2lkPSdtMicpCisKKyAgICAgICAgb3MuY2hkaXIoJ2NoZWNrb3V0
> JykKKyAgICAgICAgb3V0LCBlcnIgPSBzZWxmLnJ1bl9ienIoJ3VwZGF0ZScsICctcicsICdyZXZp
> ZDptMicpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJycsIG91dCkKKyAgICAgICAgc2VsZi5h
> c3NlcnRFcXVhbCgnQWxsIGNoYW5nZXMgYXBwbGllZCBzdWNjZXNzZnVsbHkuXG4nCisgICAgICAg
> ICAgICAgICAgICAgICAgICAgJ1VwZGF0ZWQgdG8gcmV2aXNpb24gMi5cbicsIGVycikKCg==
>
> === modified file bzrlib/workingtree.py // encoding:base64
> LS0tIGJ6cmxpYi93b3JraW5ndHJlZS5weQorKysgYnpybGliL3dvcmtpbmd0cmVlLnB5CkBAIC0x
> NTc0LDggKzE1NzQsMTAgQEAKICAgICAgICAgIiIiCiAgICAgICAgIHJhaXNlIE5vdEltcGxlbWVu
> dGVkRXJyb3Ioc2VsZi51bmxvY2spCiAKKyAgICBfbWFya2VyID0gb2JqZWN0KCkKKwogICAgIEBu
> ZWVkc193cml0ZV9sb2NrCi0gICAgZGVmIHVwZGF0ZShzZWxmKToKKyAgICBkZWYgdXBkYXRlKHNl
> bGYsIHJldmlzaW9uPU5vbmUsIG9sZF90aXA9X21hcmtlcik6CiAgICAgICAgICIiIlVwZGF0ZSBh
> IHdvcmtpbmcgdHJlZSBhbG9uZyBpdHMgYnJhbmNoLgogCiAgICAgICAgIFRoaXMgd2lsbCB1cGRh
> dGUgdGhlIGJyYW5jaCBpZiBpdHMgYm91bmQgdG9vLCB3aGljaCBtZWFucyB3ZSBoYXZlIG11bHRp
> cGxlIHRyZWVzIGludm9sdmVkOgpAQCAtMTU5Myw4ICsxNTk1LDEzIEBACiAgICAgICAgIFRoZXJl
> IGlzbid0IGEgc2luZ2xlIG9wZXJhdGlvbiBhdCB0aGUgbW9tZW50IHRvIGRvIHRoYXQsIHNvIHdl
> OgogICAgICAgICBNZXJnZSBjdXJyZW50IHN0YXRlIC0+IGJhc2lzIHRyZWUgb2YgdGhlIG1hc3Rl
> ciB3LnIudC4gdGhlIG9sZCB0cmVlIGJhc2lzLgogICAgICAgICBEbyBhICdub3JtYWwnIG1lcmdl
> IG9mIHRoZSBvbGQgYnJhbmNoIGJhc2lzIGlmIGl0IGlzIHJlbGV2YW50LgorCisgICAgICAgIDpw
> YXJhbSByZXZpc2lvbjogVGhlIHRhcmdldCByZXZpc2lvbiB0byB1cGRhdGUgdG8uIE11c3QgYmUg
> aW4gdGhlIHJldmlzaW9uIGhpc3RvcnkuCisgICAgICAgIDpwYXJhbSBvbGRfdGlwOiBJZiBicmFu
> Y2gudXBkYXRlKCkgaGFzIGFscmVhZHkgYmVlbiBydW4sIHRoZSB2YWx1ZSBpdCByZXR1cm5lZCAK
> KyAgICAgICAgKG9sZCB0aXAgb2YgdGhlIGJyYW5jaCBvciBOb25lKS4gX21hcmtlciBpcyB1c2Vk
> IG90aGVyd2lzZS4KICAgICAgICAgIiIiCi0gICAgICAgIG9sZF90aXAgPSBzZWxmLmJyYW5jaC51
> cGRhdGUoKQorICAgICAgICBpZiBvbGRfdGlwID09IHNlbGYuX21hcmtlcjoKKyAgICAgICAgICAg
> IG9sZF90aXAgPSBzZWxmLmJyYW5jaC51cGRhdGUoKQogICAgICAgICAjIGhlcmUgaWYgb2xkX3Rp
> cCBpcyBub3QgTm9uZSwgaXQgaXMgdGhlIG9sZCB0aXAgb2YgdGhlIGJyYW5jaCBiZWZvcmUKICAg
> ICAgICAgIyBpdCB3YXMgdXBkYXRlZCBmcm9tIHRoZSBtYXN0ZXIgYnJhbmNoLiBUaGlzIHNob3Vs
> ZCBiZWNvbWUgYSBwZW5kaW5nCiAgICAgICAgICMgbWVyZ2UgaW4gdGhlIHdvcmtpbmcgdHJlZSB0
> byBwcmVzZXJ2ZSB0aGUgdXNlciBleGlzdGluZyB3b3JrLiAgd2UKQEAgLTE2MTAsMjAgKzE2MTcs
> MjYgQEAKICAgICAgICAgICAgIGxhc3RfcmV2ID0gc2VsZi5nZXRfcGFyZW50X2lkcygpWzBdCiAg
> ICAgICAgIGV4Y2VwdCBJbmRleEVycm9yOgogICAgICAgICAgICAgbGFzdF9yZXYgPSBOb25lCi0g
> ICAgICAgIGlmIGxhc3RfcmV2ICE9IHNlbGYuYnJhbmNoLmxhc3RfcmV2aXNpb24oKToKKyAgICAg
> ICAgaWYgcmV2aXNpb24gaXMgTm9uZToKKyAgICAgICAgICAgIHJldmlzaW9uID0gc2VsZi5icmFu
> Y2gubGFzdF9yZXZpc2lvbigpCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBpZiByZXZpc2lv
> biBub3QgaW4gc2VsZi5icmFuY2gucmV2aXNpb25faGlzdG9yeSgpOgorICAgICAgICAgICAgICAg
> IHJhaXNlIGVycm9ycy5Ob1N1Y2hSZXZpc2lvbihzZWxmLmJyYW5jaCwgcmV2aXNpb24pCisgICAg
> ICAgIGlmIGxhc3RfcmV2ICE9IHJldmlzaW9uOgogICAgICAgICAgICAgIyBtZXJnZSB0cmVlIHN0
> YXRlIHVwIHRvIG5ldyBicmFuY2ggdGlwLgogICAgICAgICAgICAgYmFzaXMgPSBzZWxmLmJhc2lz
> X3RyZWUoKQotICAgICAgICAgICAgdG9fdHJlZSA9IHNlbGYuYnJhbmNoLmJhc2lzX3RyZWUoKQor
> ICAgICAgICAgICAgdG9fdHJlZSA9IHNlbGYuYnJhbmNoLnJlcG9zaXRvcnkucmV2aXNpb25fdHJl
> ZShyZXZpc2lvbikKICAgICAgICAgICAgIHJlc3VsdCArPSBtZXJnZV9pbm5lcihzZWxmLmJyYW5j
> aCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0b190cmVlLAogICAgICAgICAg
> ICAgICAgICAgICAgICAgICAgICAgICAgIGJhc2lzLAogICAgICAgICAgICAgICAgICAgICAgICAg
> ICAgICAgICAgIHRoaXNfdHJlZT1zZWxmKQorICAgICAgICAgICAgc2VsZi5zZXRfbGFzdF9yZXZp
> c2lvbihyZXZpc2lvbikKICAgICAgICAgICAgICMgVE9ETyAtIGRlZHVwIHBhcmVudHMgbGlzdCB3
> aXRoIHRoaW5ncyBtZXJnZWQgYnkgcHVsbCA/CiAgICAgICAgICAgICAjIHJldXNlIHRoZSB0cmVl
> IHdlJ3ZlIHVwZGF0ZWQgdG8gdG8gc2V0IHRoZSBiYXNpczoKLSAgICAgICAgICAgIHBhcmVudF90
> cmVlcyA9IFsoc2VsZi5icmFuY2gubGFzdF9yZXZpc2lvbigpLCB0b190cmVlKV0KKyAgICAgICAg
> ICAgIHBhcmVudF90cmVlcyA9IFsocmV2aXNpb24sIHRvX3RyZWUpXQogICAgICAgICAgICAgbWVy
> Z2VzID0gc2VsZi5nZXRfcGFyZW50X2lkcygpWzE6XQogICAgICAgICAgICAgIyBJZGVhbGx5IHdl
> IGFzayB0aGUgdHJlZSBmb3IgdGhlIHRyZWVzIGhlcmUsIHRoYXQgd2F5IHRoZSB3b3JraW5nCi0g
> ICAgICAgICAgICAjIHRyZWUgY2FuIGRlY2lkZSB3aGV0aGVyIHRvIGdpdmUgdXMgdGVoIGVudGly
> ZSB0cmVlIG9yIGdpdmUgdXMgYQorICAgICAgICAgICAgIyB0cmVlIGNhbiBkZWNpZGUgd2hldGhl
> ciB0byBnaXZlIHVzIHRoZSBlbnRpcmUgdHJlZSBvciBnaXZlIHVzIGEKICAgICAgICAgICAgICMg
> bGF6eSBpbml0aWFsaXNlZCB0cmVlLiBkaXJzdGF0ZSBmb3IgaW5zdGFuY2Ugd2lsbCBoYXZlIHRo
> ZSB0cmVlcwogICAgICAgICAgICAgIyBpbiByYW0gYWxyZWFkeSwgd2hlcmVhcyBhIGxhc3QtcmV2
> aXNpb24gKyBiYXNpcy1pbnZlbnRvcnkgdHJlZQogICAgICAgICAgICAgIyB3aWxsIG5vdCwgYnV0
> IGFsc28gZG9lcyBub3QgbmVlZCB0aGVtIHdoZW4gc2V0dGluZyBwYXJlbnRzLgpAQCAtMTY0OCw3
> ICsxNjYxLDcgQEAKICAgICAgICAgICAgICMgYW5kIHRoZSBub3cgcGVuZGluZyBtZXJnZQogICAg
> ICAgICAgICAgZnJvbSBienJsaWIucmV2aXNpb24gaW1wb3J0IGNvbW1vbl9hbmNlc3RvcgogICAg
> ICAgICAgICAgdHJ5OgotICAgICAgICAgICAgICAgIGJhc2VfcmV2X2lkID0gY29tbW9uX2FuY2Vz
> dG9yKHNlbGYuYnJhbmNoLmxhc3RfcmV2aXNpb24oKSwKKyAgICAgICAgICAgICAgICBiYXNlX3Jl
> dl9pZCA9IGNvbW1vbl9hbmNlc3RvcihyZXZpc2lvbiwKICAgICAgICAgICAgICAgICAgICAgICAg
> ICAgICAgICAgICAgICAgICAgICAgICBvbGRfdGlwLAogICAgICAgICAgICAgICAgICAgICAgICAg
> ICAgICAgICAgICAgICAgICAgICAgIHNlbGYuYnJhbmNoLnJlcG9zaXRvcnkpCiAgICAgICAgICAg
> ICBleGNlcHQgZXJyb3JzLk5vQ29tbW9uQW5jZXN0b3I6Cgo=
>
> # revision id: Matthieu.Moy at imag.fr-20060927132040-6cdca203f2f35e81
> # sha1: 294b36a31ec07a11f246b1eaba934d814cee2567
> # inventory sha1: 93f9e6ad98c82158616bc18418f48e9b17858d7e
> # parent ids:
> # Matthieu.Moy at imag.fr-20060909180144-3a3e92fbaaee00c2
> # pqm at pqm.ubuntu.com-20060910185720-1bcc17b99fe77687
> # properties:
> # branch-nick: bzr.update-r
>
> # message:
> # Fixed bad conflict resolution.
> #
> # committer: Matthieu Moy <Matthieu.Moy at imag.fr>
> # date: Sat 2006-09-09 20:01:44.042999983 +0200
>
> === modified file bzrlib/workingtree.py // encoding:base64
> LS0tIGJ6cmxpYi93b3JraW5ndHJlZS5weQorKysgYnpybGliL3dvcmtpbmd0cmVlLnB5CkBAIC0x
> NjEyLDE1ICsxNjEyLDE2IEBACiAgICAgICAgICMgbG9jYWwgd29yayBpcyB1bnJlZmVyZW5jZWQg
> YW5kIHdpbGwgYXBwZWFyIHRvIGhhdmUgYmVlbiBsb3N0LgogICAgICAgICAjIAogICAgICAgICBy
> ZXN1bHQgPSAwCisgICAgICAgIHRyeToKKyAgICAgICAgICAgIGxhc3RfcmV2ID0gc2VsZi5nZXRf
> cGFyZW50X2lkcygpWzBdCisgICAgICAgIGV4Y2VwdCBJbmRleEVycm9yOgorICAgICAgICAgICAg
> bGFzdF9yZXYgPSBOb25lCiAgICAgICAgIGlmIHJldmlzaW9uIGlzIE5vbmU6Ci0gICAgICAgICAg
> ICB0cnk6Ci0gICAgICAgICAgICAgICAgbGFzdF9yZXYgPSBzZWxmLmdldF9wYXJlbnRfaWRzKClb
> MF0KLSAgICAgICAgICAgIGV4Y2VwdCBJbmRleEVycm9yOgotICAgICAgICAgICAgICAgIGxhc3Rf
> cmV2ID0gTm9uZQorICAgICAgICAgICAgcmV2aXNpb24gPSBzZWxmLmJyYW5jaC5sYXN0X3Jldmlz
> aW9uKCkKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIGlmIHJldmlzaW9uIG5vdCBpbiBzZWxm
> LmJyYW5jaC5yZXZpc2lvbl9oaXN0b3J5KCk6CiAgICAgICAgICAgICAgICAgcmFpc2UgZXJyb3Jz
> Lk5vU3VjaFJldmlzaW9uKHNlbGYuYnJhbmNoLCByZXZpc2lvbikKLSAgICAgICAgaWYgcmV2aXNp
> b24gIT0gc2VsZi5sYXN0X3JldmlzaW9uKCk6CisgICAgICAgIGlmIGxhc3RfcmV2ICE9IHJldmlz
> aW9uOgogICAgICAgICAgICAgIyBtZXJnZSB0cmVlIHN0YXRlIHVwIHRvIG5ldyBicmFuY2ggdGlw
> LgogICAgICAgICAgICAgYmFzaXMgPSBzZWxmLmJhc2lzX3RyZWUoKQogICAgICAgICAgICAgdG9f
> dHJlZSA9IHNlbGYuYnJhbmNoLnJlcG9zaXRvcnkucmV2aXNpb25fdHJlZShyZXZpc2lvbikKCg==
>
> # revision id: Matthieu.Moy at imag.fr-20060909180144-3a3e92fbaaee00c2
> # sha1: 3d0128cd0bd8afcffd392b3d5303857c391cf111
> # inventory sha1: c2be576959418bfcfa9a07add1d73e583bd35998
> # parent ids:
> # Matthieu.Moy at imag.fr-20060909174342-2c78ab0d4f42feda
> # properties:
> # branch-nick: bzr.update-r
>
> # message:
> # Manage InvalidRevisionSpec in update command.
> #
> # committer: Matthieu Moy <Matthieu.Moy at imag.fr>
> # date: Sat 2006-09-09 19:43:42.737999916 +0200
>
> === modified file bzrlib/builtins.py // encoding:base64
> LS0tIGJ6cmxpYi9idWlsdGlucy5weQorKysgYnpybGliL2J1aWx0aW5zLnB5CkBAIC00Niw3ICs0
> Niw3IEBACiBmcm9tIGJ6cmxpYi5lcnJvcnMgaW1wb3J0IChCenJFcnJvciwgQnpyQ2hlY2tFcnJv
> ciwgQnpyQ29tbWFuZEVycm9yLCAKICAgICAgICAgICAgICAgICAgICAgICAgICAgIE5vdEJyYW5j
> aEVycm9yLCBEaXZlcmdlZEJyYW5jaGVzLCBOb3RDb25mbGljdGVkLAogICAgICAgICAgICAgICAg
> ICAgICAgICAgICAgTm9TdWNoRmlsZSwgTm9Xb3JraW5nVHJlZSwgRmlsZUluV3JvbmdCcmFuY2gs
> Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICBOb3RWZXJzaW9uZWRFcnJvciwgTm90QUJ1bmRs
> ZSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIE5vdFZlcnNpb25lZEVycm9yLCBOb3RBQnVu
> ZGxlLCBJbnZhbGlkUmV2aXNpb25TcGVjKQogZnJvbSBienJsaWIubWVyZ2UgaW1wb3J0IE1lcmdl
> M01lcmdlcgogZnJvbSBienJsaWIub3B0aW9uIGltcG9ydCBPcHRpb24KIGZyb20gYnpybGliLnBy
> b2dyZXNzIGltcG9ydCBEdW1teVByb2dyZXNzLCBQcm9ncmVzc1BoYXNlCkBAIC04MzYsNyArODM2
> LDcgQEAKICAgICAgICAgICAgICAgICAgICAgcmV2ID0gcmV2aXNpb25bMF0uaW5faGlzdG9yeShi
> cmFuY2gpLnJldl9pZAogICAgICAgICAgICAgICAgICAgICAjIG5vIG5lZWQgdG8gcnVuIGJyYW5j
> aC51cGRhdGUoKQogICAgICAgICAgICAgICAgICAgICBvbGRfdGlwID0gTm9uZQotICAgICAgICAg
> ICAgICAgIGV4Y2VwdCBlcnJvcnMuTm9TdWNoUmV2aXNpb246CisgICAgICAgICAgICAgICAgZXhj
> ZXB0IChlcnJvcnMuTm9TdWNoUmV2aXNpb24sIGVycm9ycy5JbnZhbGlkUmV2aXNpb25TcGVjKToK
> ICAgICAgICAgICAgICAgICAgICAgIyByZXZpc2lvbiB3YXMgbm90IHRoZXJlLCBidXQgaXMgbWF5
> YmUgaW4gdGhlIG1hc3Rlci4KICAgICAgICAgICAgICAgICAgICAgb2xkX3RpcCA9IGJyYW5jaC51
> cGRhdGUoKQogICAgICAgICAgICAgICAgICAgICByZXYgPSByZXZpc2lvblswXS5pbl9oaXN0b3J5
> KGJyYW5jaCkucmV2X2lkCgo=
>
> === modified file bzrlib/workingtree.py // encoding:base64
> LS0tIGJ6cmxpYi93b3JraW5ndHJlZS5weQorKysgYnpybGliL3dvcmtpbmd0cmVlLnB5CkBAIC0x
> NjM0LDcgKzE2MzQsNyBAQAogICAgICAgICAgICAgcGFyZW50X3RyZWVzID0gWyhyZXZpc2lvbiwg
> dG9fdHJlZSldCiAgICAgICAgICAgICBtZXJnZXMgPSBzZWxmLmdldF9wYXJlbnRfaWRzKClbMTpd
> CiAgICAgICAgICAgICAjIElkZWFsbHkgd2UgYXNrIHRoZSB0cmVlIGZvciB0aGUgdHJlZXMgaGVy
> ZSwgdGhhdCB3YXkgdGhlIHdvcmtpbmcKLSAgICAgICAgICAgICMgdHJlZSBjYW4gZGVjaWRlIHdo
> ZXRoZXIgdG8gZ2l2ZSB1cyB0ZWggZW50aXJlIHRyZWUgb3IgZ2l2ZSB1cyBhCisgICAgICAgICAg
> ICAjIHRyZWUgY2FuIGRlY2lkZSB3aGV0aGVyIHRvIGdpdmUgdXMgdGhlIGVudGlyZSB0cmVlIG9y
> IGdpdmUgdXMgYQogICAgICAgICAgICAgIyBsYXp5IGluaXRpYWxpc2VkIHRyZWUuIGRpcnN0YXRl
> IGZvciBpbnN0YW5jZSB3aWxsIGhhdmUgdGhlIHRyZWVzCiAgICAgICAgICAgICAjIGluIHJhbSBh
> bHJlYWR5LCB3aGVyZWFzIGEgbGFzdC1yZXZpc2lvbiArIGJhc2lzLWludmVudG9yeSB0cmVlCiAg
> ICAgICAgICAgICAjIHdpbGwgbm90LCBidXQgYWxzbyBkb2VzIG5vdCBuZWVkIHRoZW0gd2hlbiBz
> ZXR0aW5nIHBhcmVudHMuCgo=
>
> # revision id: Matthieu.Moy at imag.fr-20060909174342-2c78ab0d4f42feda
> # sha1: a0ca74fa7e0f92d3dba4d482f4316263e328736f
> # inventory sha1: 4c76f42e753e06cb52c12f9b76a7135f03e9e670
> # parent ids:
> # Matthieu.Moy at imag.fr-20060909173343-c3f80d5539451752
> # properties:
> # branch-nick: bzr.update-r
>
> # message:
> # Simple fixes (deprecation warning, use revision where needed)
> #
> # committer: Matthieu Moy <Matthieu.Moy at imag.fr>
> # date: Sat 2006-09-09 19:33:43.246999979 +0200
>
> === modified file bzrlib/builtins.py // encoding:base64
> LS0tIGJ6cmxpYi9idWlsdGlucy5weQorKysgYnpybGliL2J1aWx0aW5zLnB5CkBAIC04MjcsNyAr
> ODI3LDcgQEAKICAgICAgICAgYnJhbmNoID0gdHJlZS5icmFuY2gKICAgICAgICAgdHJlZS5sb2Nr
> X3dyaXRlKCkKICAgICAgICAgdHJ5OgotICAgICAgICAgICAgZXhpc3RpbmdfcGVuZGluZ19tZXJn
> ZXMgPSB0cmVlLnBlbmRpbmdfbWVyZ2VzKCkKKyAgICAgICAgICAgIGV4aXN0aW5nX3BlbmRpbmdf
> bWVyZ2VzID0gdHJlZS5nZXRfcGFyZW50X2lkcygpWzE6XQogICAgICAgICAgICAgIyBwb3RlbnRp
> YWxseSBnZXQgbmV3IHJldmlzaW9ucyBmcm9tIHRoZSBtYXN0ZXIgYnJhbmNoLgogICAgICAgICAg
> ICAgIyBuZWVkZWQgZm9yIHRoZSBjYXNlIHdoZXJlIC1yIE4gaXMgZ2l2ZW4sIHdpdGggTiBub3Qg
> eWV0CiAgICAgICAgICAgICAjIGluIHRoZSBsb2NhbCBicmFuY2ggZm9yIGEgaGVhdnl3ZWlnaHQg
> Y2hlY2tvdXQuCkBAIC04NTUsNyArODU1LDcgQEAKICAgICAgICAgICAgICAgICAgICAgICAgICAg
> ICAgICAgICAgICAgJSAoZS5yZXZpc2lvbikpCiAgICAgICAgICAgICByZXZubyA9IGJyYW5jaC5y
> ZXZpc2lvbl9pZF90b19yZXZubyh0cmVlLmxhc3RfcmV2aXNpb24oKSkKICAgICAgICAgICAgIG5v
> dGUoJ1VwZGF0ZWQgdG8gcmV2aXNpb24gJWQuJyAlIChyZXZubywpKQotICAgICAgICAgICAgaWYg
> dHJlZS5wZW5kaW5nX21lcmdlcygpICE9IGV4aXN0aW5nX3BlbmRpbmdfbWVyZ2VzOgorICAgICAg
> ICAgICAgaWYgdHJlZS5nZXRfcGFyZW50X2lkcygpWzE6XSAhPSBleGlzdGluZ19wZW5kaW5nX21l
> cmdlczoKICAgICAgICAgICAgICAgICBub3RlKCdZb3VyIGxvY2FsIGNvbW1pdHMgd2lsbCBub3cg
> c2hvdyBhcyBwZW5kaW5nIG1lcmdlcyB3aXRoICcKICAgICAgICAgICAgICAgICAgICAgICInYnpy
> IHN0YXR1cycsIGFuZCBjYW4gYmUgY29tbWl0dGVkIHdpdGggJ2J6ciBjb21taXQnLiIpCiAgICAg
> ICAgICAgICBpZiBjb25mbGljdHMgIT0gMDoKCg==
>
> === modified file bzrlib/workingtree.py // encoding:base64
> LS0tIGJ6cmxpYi93b3JraW5ndHJlZS5weQorKysgYnpybGliL3dvcmtpbmd0cmVlLnB5CkBAIC0x
> NjMxLDcgKzE2MzEsNyBAQAogICAgICAgICAgICAgc2VsZi5zZXRfbGFzdF9yZXZpc2lvbihyZXZp
> c2lvbikKICAgICAgICAgICAgICMgVE9ETyAtIGRlZHVwIHBhcmVudHMgbGlzdCB3aXRoIHRoaW5n
> cyBtZXJnZWQgYnkgcHVsbCA/CiAgICAgICAgICAgICAjIHJldXNlIHRoZSB0cmVlIHdlJ3ZlIHVw
> ZGF0ZWQgdG8gdG8gc2V0IHRoZSBiYXNpczoKLSAgICAgICAgICAgIHBhcmVudF90cmVlcyA9IFso
> c2VsZi5icmFuY2gubGFzdF9yZXZpc2lvbigpLCB0b190cmVlKV0KKyAgICAgICAgICAgIHBhcmVu
> dF90cmVlcyA9IFsocmV2aXNpb24sIHRvX3RyZWUpXQogICAgICAgICAgICAgbWVyZ2VzID0gc2Vs
> Zi5nZXRfcGFyZW50X2lkcygpWzE6XQogICAgICAgICAgICAgIyBJZGVhbGx5IHdlIGFzayB0aGUg
> dHJlZSBmb3IgdGhlIHRyZWVzIGhlcmUsIHRoYXQgd2F5IHRoZSB3b3JraW5nCiAgICAgICAgICAg
> ICAjIHRyZWUgY2FuIGRlY2lkZSB3aGV0aGVyIHRvIGdpdmUgdXMgdGVoIGVudGlyZSB0cmVlIG9y
> IGdpdmUgdXMgYQoK
>
> # revision id: Matthieu.Moy at imag.fr-20060909173343-c3f80d5539451752
> # sha1: 0d7e0fac6d8b2febc1f563691535109193146056
> # inventory sha1: 27733b98443c2c59a21233049ec79282a8acb15e
> # parent ids:
> # Matthieu.Moy at imag.fr-20060909165528-ac314e31493c5283
> # properties:
> # branch-nick: bzr.update-r
>
> # message:
> # Merged from bzr.dev
> # committer: Matthieu Moy <Matthieu.Moy at imag.fr>
> # date: Sat 2006-09-09 18:55:28.497999907 +0200
>
> === modified file bzrlib/builtins.py //
last-changed:Matthieu.Moy at imag.fr-20060
> ... 902121702-5a0c8b684bd58a57 // encoding:base64
> LS0tIGJ6cmxpYi9idWlsdGlucy5weQorKysgYnpybGliL2J1aWx0aW5zLnB5CkBAIC04MTcsMjMg
> KzgxNyw0MyBAQAogICAgICdienIgcmV2ZXJ0JyBpbnN0ZWFkIG9mICdienIgY29tbWl0JyBhZnRl
> ciB0aGUgdXBkYXRlLgogICAgICIiIgogICAgIHRha2VzX2FyZ3MgPSBbJ2Rpcj8nXQorICAgIHRh
> a2VzX29wdGlvbnMgPSBbJ3JldmlzaW9uJ10KICAgICBhbGlhc2VzID0gWyd1cCddCiAKLSAgICBk
> ZWYgcnVuKHNlbGYsIGRpcj0nLicpOgorICAgIGRlZiBydW4oc2VsZiwgZGlyPScuJywgcmV2aXNp
> b249Tm9uZSk6CisgICAgICAgIGlmIHJldmlzaW9uIGlzIG5vdCBOb25lIGFuZCBsZW4ocmV2aXNp
> b24pICE9IDE6CisgICAgICAgICAgICByYWlzZSBCenJDb21tYW5kRXJyb3IoImJ6ciB1cGRhdGUg
> LS1yZXZpc2lvbiB0YWtlcyBleGFjdGx5IG9uZSByZXZpc2lvbiIpCiAgICAgICAgIHRyZWUgPSBX
> b3JraW5nVHJlZS5vcGVuX2NvbnRhaW5pbmcoZGlyKVswXQorICAgICAgICBicmFuY2ggPSB0cmVl
> LmJyYW5jaAogICAgICAgICB0cmVlLmxvY2tfd3JpdGUoKQogICAgICAgICB0cnk6CiAgICAgICAg
> ICAgICBleGlzdGluZ19wZW5kaW5nX21lcmdlcyA9IHRyZWUucGVuZGluZ19tZXJnZXMoKQotICAg
> ICAgICAgICAgbGFzdF9yZXYgPSB0cmVlLmxhc3RfcmV2aXNpb24oKQotICAgICAgICAgICAgaWYg
> bGFzdF9yZXYgPT0gdHJlZS5icmFuY2gubGFzdF9yZXZpc2lvbigpOgotICAgICAgICAgICAgICAg
> ICMgbWF5IGJlIHVwIHRvIGRhdGUsIGNoZWNrIG1hc3RlciB0b28uCi0gICAgICAgICAgICAgICAg
> bWFzdGVyID0gdHJlZS5icmFuY2guZ2V0X21hc3Rlcl9icmFuY2goKQotICAgICAgICAgICAgICAg
> IGlmIG1hc3RlciBpcyBOb25lIG9yIGxhc3RfcmV2ID09IG1hc3Rlci5sYXN0X3JldmlzaW9uKCk6
> Ci0gICAgICAgICAgICAgICAgICAgIHJldm5vID0gdHJlZS5icmFuY2gucmV2aXNpb25faWRfdG9f
> cmV2bm8obGFzdF9yZXYpCi0gICAgICAgICAgICAgICAgICAgIG5vdGUoIlRyZWUgaXMgdXAgdG8g
> ZGF0ZSBhdCByZXZpc2lvbiAlZC4iICUgKHJldm5vLCkpCi0gICAgICAgICAgICAgICAgICAgIHJl
> dHVybiAwCi0gICAgICAgICAgICBjb25mbGljdHMgPSB0cmVlLnVwZGF0ZSgpCi0gICAgICAgICAg
> ICByZXZubyA9IHRyZWUuYnJhbmNoLnJldmlzaW9uX2lkX3RvX3Jldm5vKHRyZWUubGFzdF9yZXZp
> c2lvbigpKQorICAgICAgICAgICAgIyBwb3RlbnRpYWxseSBnZXQgbmV3IHJldmlzaW9ucyBmcm9t
> IHRoZSBtYXN0ZXIgYnJhbmNoLgorICAgICAgICAgICAgIyBuZWVkZWQgZm9yIHRoZSBjYXNlIHdo
> ZXJlIC1yIE4gaXMgZ2l2ZW4sIHdpdGggTiBub3QgeWV0CisgICAgICAgICAgICAjIGluIHRoZSBs
> b2NhbCBicmFuY2ggZm9yIGEgaGVhdnl3ZWlnaHQgY2hlY2tvdXQuCisgICAgICAgICAgICBpZiBy
> ZXZpc2lvbiBpcyBub3QgTm9uZToKKyAgICAgICAgICAgICAgICB0cnk6CisgICAgICAgICAgICAg
> ICAgICAgIHJldiA9IHJldmlzaW9uWzBdLmluX2hpc3RvcnkoYnJhbmNoKS5yZXZfaWQKKyAgICAg
> ICAgICAgICAgICAgICAgIyBubyBuZWVkIHRvIHJ1biBicmFuY2gudXBkYXRlKCkKKyAgICAgICAg
> ICAgICAgICAgICAgb2xkX3RpcCA9IE5vbmUKKyAgICAgICAgICAgICAgICBleGNlcHQgZXJyb3Jz
> Lk5vU3VjaFJldmlzaW9uOgorICAgICAgICAgICAgICAgICAgICAjIHJldmlzaW9uIHdhcyBub3Qg
> dGhlcmUsIGJ1dCBpcyBtYXliZSBpbiB0aGUgbWFzdGVyLgorICAgICAgICAgICAgICAgICAgICBv
> bGRfdGlwID0gYnJhbmNoLnVwZGF0ZSgpCisgICAgICAgICAgICAgICAgICAgIHJldiA9IHJldmlz
> aW9uWzBdLmluX2hpc3RvcnkoYnJhbmNoKS5yZXZfaWQKKyAgICAgICAgICAgIGVsc2U6CisgICAg
> ICAgICAgICAgICAgb2xkX3RpcCA9IGJyYW5jaC51cGRhdGUoKQorICAgICAgICAgICAgICAgIHJl
> diA9IGJyYW5jaC5sYXN0X3JldmlzaW9uKCkKKyAgICAgICAgICAgIGlmIHRyZWUubGFzdF9yZXZp
> c2lvbigpID09IHJldjoKKyAgICAgICAgICAgICAgICByZXZubyA9IGJyYW5jaC5yZXZpc2lvbl9p
> ZF90b19yZXZubyhyZXYpCisgICAgICAgICAgICAgICAgbm90ZSgiVHJlZSBpcyB1cCB0byBkYXRl
> IGF0IHJldmlzaW9uICVkLiIgJSAocmV2bm8sKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gMAor
> ICAgICAgICAgICAgdHJ5OgorICAgICAgICAgICAgICAgIGNvbmZsaWN0cyA9IHRyZWUudXBkYXRl
> KHJldiwgb2xkX3RpcCkKKyAgICAgICAgICAgIGV4Y2VwdCBlcnJvcnMuTm9TdWNoUmV2aXNpb24s
> IGU6CisgICAgICAgICAgICAgICAgcmFpc2UgQnpyQ29tbWFuZEVycm9yKCJicmFuY2ggaGFzIG5v
> IHJldmlzaW9uICVzXG4iCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJi
> enIgdXBkYXRlIC0tcmV2aXNpb24gd29ya3Mgb25seSBmb3IgYSByZXZpc2lvbiBpbiB0aGUgYnJh
> bmNoIGhpc3RvcnkiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICUgKGUu
> cmV2aXNpb24pKQorICAgICAgICAgICAgcmV2bm8gPSBicmFuY2gucmV2aXNpb25faWRfdG9fcmV2
> bm8odHJlZS5sYXN0X3JldmlzaW9uKCkpCiAgICAgICAgICAgICBub3RlKCdVcGRhdGVkIHRvIHJl
> dmlzaW9uICVkLicgJSAocmV2bm8sKSkKICAgICAgICAgICAgIGlmIHRyZWUucGVuZGluZ19tZXJn
> ZXMoKSAhPSBleGlzdGluZ19wZW5kaW5nX21lcmdlczoKICAgICAgICAgICAgICAgICBub3RlKCdZ
> b3VyIGxvY2FsIGNvbW1pdHMgd2lsbCBub3cgc2hvdyBhcyBwZW5kaW5nIG1lcmdlcyB3aXRoICcK
> Cg==
>
> === modified file bzrlib/tests/blackbox/test_update.py //
last-changed:Matthieu
> ... .Moy at imag.fr-20060902121702-5a0c8b684bd58a57 // encoding:base64
> LS0tIGJ6cmxpYi90ZXN0cy9ibGFja2JveC90ZXN0X3VwZGF0ZS5weQorKysgYnpybGliL3Rlc3Rz
> L2JsYWNrYm94L3Rlc3RfdXBkYXRlLnB5CkBAIC0xOTcsMyArMTk3LDczIEBACiAKICAgICAgICAg
> IyBUaGUgcGVuZGluZyBtZXJnZXMgc2hvdWxkIHN0aWxsIGJlIHRoZXJlCiAgICAgICAgIHNlbGYu
> YXNzZXJ0RXF1YWwoWydvMiddLCBjaGVja291dDEuZ2V0X3BhcmVudF9pZHMoKVsxOl0pCisKKyAg
> ICBkZWYgdGVzdF91cGRhdGVfZGFzaF9yKHNlbGYpOgorICAgICAgICAjIFRlc3QgdGhhdCAnYnpy
> IHVwZGF0ZScgd29ya3MgY29ycmVjdGx5IHdoZW4geW91IGhhdmUKKyAgICAgICAgIyBhbiB1cGRh
> dGUgaW4gdGhlIG1hc3RlciB0cmVlLCBhbmQgYSBsaWdodHdlaWdodCBjaGVja291dAorICAgICAg
> ICAjIHdoaWNoIGhhcyBtZXJnZWQgYW5vdGhlciBicmFuY2gKKyAgICAgICAgbWFzdGVyID0gc2Vs
> Zi5tYWtlX2JyYW5jaF9hbmRfdHJlZSgnbWFzdGVyJykKKyAgICAgICAgb3MuY2hkaXIoJ21hc3Rl
> cicpCisgICAgICAgIHNlbGYuYnVpbGRfdHJlZShbJy4vZmlsZTEnXSkKKyAgICAgICAgbWFzdGVy
> LmFkZChbJ2ZpbGUxJ10pCisgICAgICAgIG1hc3Rlci5jb21taXQoJ29uZScsIHJldl9pZD0nbTEn
> KQorICAgICAgICBzZWxmLmJ1aWxkX3RyZWUoWycuL2ZpbGUyJ10pCisgICAgICAgIG1hc3Rlci5h
> ZGQoWydmaWxlMiddKQorICAgICAgICBtYXN0ZXIuY29tbWl0KCd0d28nLCByZXZfaWQ9J20yJykK
> KyAgICAgICAgCisgICAgICAgIG91dCwgZXJyID0gc2VsZi5ydW5fYnpyKCd1cGRhdGUnLCAnLXIn
> LCAnMScpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJycsIG91dCkKKyAgICAgICAgc2VsZi5h
> c3NlcnRFcXVhbCgnQWxsIGNoYW5nZXMgYXBwbGllZCBzdWNjZXNzZnVsbHkuXG4nCisgICAgICAg
> ICAgICAgICAgICAgICAgICAgJ1VwZGF0ZWQgdG8gcmV2aXNpb24gMS5cbicsIGVycikKKyAgICAg
> ICAgc2VsZi5mYWlsVW5sZXNzRXhpc3RzKCcuL2ZpbGUxJykKKyAgICAgICAgc2VsZi5mYWlsSWZF
> eGlzdHMoJy4vZmlsZTInKQorICAgICAgICBzZWxmLmNoZWNrX2ZpbGVfY29udGVudHMoJy5ienIv
> Y2hlY2tvdXQvbGFzdC1yZXZpc2lvbicsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
> ICAnbTEnKQorCisgICAgZGVmIHRlc3RfdXBkYXRlX2Rhc2hfcl9vdXRzaWRlX2hpc3Rvcnkoc2Vs
> Zik6CisgICAgICAgICMgVGVzdCB0aGF0ICdienIgdXBkYXRlJyB3b3JrcyBjb3JyZWN0bHkgd2hl
> biB5b3UgaGF2ZQorICAgICAgICAjIGFuIHVwZGF0ZSBpbiB0aGUgbWFzdGVyIHRyZWUsIGFuZCBh
> IGxpZ2h0d2VpZ2h0IGNoZWNrb3V0CisgICAgICAgICMgd2hpY2ggaGFzIG1lcmdlZCBhbm90aGVy
> IGJyYW5jaAorICAgICAgICBtYXN0ZXIgPSBzZWxmLm1ha2VfYnJhbmNoX2FuZF90cmVlKCdtYXN0
> ZXInKQorICAgICAgICBzZWxmLmJ1aWxkX3RyZWUoWydtYXN0ZXIvZmlsZTEnXSkKKyAgICAgICAg
> bWFzdGVyLmFkZChbJ2ZpbGUxJ10pCisgICAgICAgIG1hc3Rlci5jb21taXQoJ29uZScsIHJldl9p
> ZD0nbTEnKQorCisgICAgICAgICMgQ3JlYXRlIGEgc2Vjb25kIGJyYW5jaCwgd2l0aCBhbiBleHRy
> YSBjb21taXQKKyAgICAgICAgb3RoZXIgPSBtYXN0ZXIuYnpyZGlyLnNwcm91dCgnb3RoZXInKS5v
> cGVuX3dvcmtpbmd0cmVlKCkKKyAgICAgICAgc2VsZi5idWlsZF90cmVlKFsnb3RoZXIvZmlsZTIn
> XSkKKyAgICAgICAgb3RoZXIuYWRkKFsnZmlsZTInXSkKKyAgICAgICAgb3RoZXIuY29tbWl0KCdv
> dGhlcjInLCByZXZfaWQ9J28yJykKKworICAgICAgICBvcy5jaGRpcignbWFzdGVyJykKKyAgICAg
> ICAgc2VsZi5ydW5fYnpyKCdtZXJnZScsICcuLi9vdGhlcicpCisgICAgICAgIG1hc3Rlci5jb21t
> aXQoJ21lcmdlJywgcmV2X2lkPSdtZXJnZScpCisKKyAgICAgICAgb3V0LCBlcnIgPSBzZWxmLnJ1
> bl9ienIoJ3VwZGF0ZScsICctcicsICdyZXZpZDpvMicsCisgICAgICAgICAgICAgICAgICAgICAg
> ICAgICAgICAgIHJldGNvZGU9MykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnJywgb3V0KQor
> ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCdienI6IEVSUk9SOiBicmFuY2ggaGFzIG5vIHJldmlz
> aW9uIG8yXG4nCisgICAgICAgICAgICAgICAgICAgICAgICAgJ2J6ciB1cGRhdGUgLS1yZXZpc2lv
> biB3b3JrcyBvbmx5JworICAgICAgICAgICAgICAgICAgICAgICAgICcgZm9yIGEgcmV2aXNpb24g
> aW4gdGhlIGJyYW5jaCBoaXN0b3J5XG4nLAorICAgICAgICAgICAgICAgICAgICAgICAgIGVycikK
> KworICAgIGRlZiB0ZXN0X3VwZGF0ZV9kYXNoX3JfaW5fbWFzdGVyKHNlbGYpOgorICAgICAgICAj
> IFRlc3QgdGhhdCAnYnpyIHVwZGF0ZScgd29ya3MgY29ycmVjdGx5IHdoZW4geW91IGhhdmUKKyAg
> ICAgICAgIyBhbiB1cGRhdGUgaW4gdGhlIG1hc3RlciB0cmVlLAorICAgICAgICBtYXN0ZXIgPSBz
> ZWxmLm1ha2VfYnJhbmNoX2FuZF90cmVlKCdtYXN0ZXInKQorICAgICAgICBzZWxmLmJ1aWxkX3Ry
> ZWUoWydtYXN0ZXIvZmlsZTEnXSkKKyAgICAgICAgbWFzdGVyLmFkZChbJ2ZpbGUxJ10pCisgICAg
> ICAgIG1hc3Rlci5jb21taXQoJ29uZScsIHJldl9pZD0nbTEnKQorCisgICAgICAgIHNlbGYucnVu
> X2J6cignY2hlY2tvdXQnLCAnbWFzdGVyJywgJ2NoZWNrb3V0JykKKworICAgICAgICAjIGFkZCBh
> IHJldmlzaW9uIGluIHRoZSBtYXN0ZXIuCisgICAgICAgIHNlbGYuYnVpbGRfdHJlZShbJ21hc3Rl
> ci9maWxlMiddKQorICAgICAgICBtYXN0ZXIuYWRkKFsnZmlsZTInXSkKKyAgICAgICAgbWFzdGVy
> LmNvbW1pdCgndHdvJywgcmV2X2lkPSdtMicpCisKKyAgICAgICAgb3MuY2hkaXIoJ2NoZWNrb3V0
> JykKKyAgICAgICAgb3V0LCBlcnIgPSBzZWxmLnJ1bl9ienIoJ3VwZGF0ZScsICctcicsICdyZXZp
> ZDptMicpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJycsIG91dCkKKyAgICAgICAgc2VsZi5h
> c3NlcnRFcXVhbCgnQWxsIGNoYW5nZXMgYXBwbGllZCBzdWNjZXNzZnVsbHkuXG4nCisgICAgICAg
> ICAgICAgICAgICAgICAgICAgJ1VwZGF0ZWQgdG8gcmV2aXNpb24gMi5cbicsIGVycikKCg==
>
> === modified file bzrlib/workingtree.py // encoding:base64
> LS0tIGJ6cmxpYi93b3JraW5ndHJlZS5weQorKysgYnpybGliL3dvcmtpbmd0cmVlLnB5CkBAIC0x
> NTczLDggKzE1NzMsMTAgQEAKICAgICAgICAgIiIiCiAgICAgICAgIHJhaXNlIE5vdEltcGxlbWVu
> dGVkRXJyb3Ioc2VsZi51bmxvY2spCiAKKyAgICBfbWFya2VyID0gb2JqZWN0KCkKKwogICAgIEBu
> ZWVkc193cml0ZV9sb2NrCi0gICAgZGVmIHVwZGF0ZShzZWxmKToKKyAgICBkZWYgdXBkYXRlKHNl
> bGYsIHJldmlzaW9uPU5vbmUsIG9sZF90aXA9X21hcmtlcik6CiAgICAgICAgICIiIlVwZGF0ZSBh
> IHdvcmtpbmcgdHJlZSBhbG9uZyBpdHMgYnJhbmNoLgogCiAgICAgICAgIFRoaXMgd2lsbCB1cGRh
> dGUgdGhlIGJyYW5jaCBpZiBpdHMgYm91bmQgdG9vLCB3aGljaCBtZWFucyB3ZSBoYXZlIG11bHRp
> cGxlIHRyZWVzIGludm9sdmVkOgpAQCAtMTU5Miw4ICsxNTk0LDEzIEBACiAgICAgICAgIFRoZXJl
> IGlzbid0IGEgc2luZ2xlIG9wZXJhdGlvbiBhdCB0aGUgbW9tZW50IHRvIGRvIHRoYXQsIHNvIHdl
> OgogICAgICAgICBNZXJnZSBjdXJyZW50IHN0YXRlIC0+IGJhc2lzIHRyZWUgb2YgdGhlIG1hc3Rl
> ciB3LnIudC4gdGhlIG9sZCB0cmVlIGJhc2lzLgogICAgICAgICBEbyBhICdub3JtYWwnIG1lcmdl
> IG9mIHRoZSBvbGQgYnJhbmNoIGJhc2lzIGlmIGl0IGlzIHJlbGV2YW50LgorCisgICAgICAgIDpw
> YXJhbSByZXZpc2lvbjogVGhlIHRhcmdldCByZXZpc2lvbiB0byB1cGRhdGUgdG8uIE11c3QgYmUg
> aW4gdGhlIHJldmlzaW9uIGhpc3RvcnkuCisgICAgICAgIDpwYXJhbSBvbGRfdGlwOiBJZiBicmFu
> Y2gudXBkYXRlKCkgaGFzIGFscmVhZHkgYmVlbiBydW4sIHRoZSB2YWx1ZSBpdCByZXR1cm5lZCAK
> KyAgICAgICAgKG9sZCB0aXAgb2YgdGhlIGJyYW5jaCBvciBOb25lKS4gX21hcmtlciBpcyB1c2Vk
> IG90aGVyd2lzZS4KICAgICAgICAgIiIiCi0gICAgICAgIG9sZF90aXAgPSBzZWxmLmJyYW5jaC51
> cGRhdGUoKQorICAgICAgICBpZiBvbGRfdGlwID09IHNlbGYuX21hcmtlcjoKKyAgICAgICAgICAg
> IG9sZF90aXAgPSBzZWxmLmJyYW5jaC51cGRhdGUoKQogICAgICAgICAjIGhlcmUgaWYgb2xkX3Rp
> cCBpcyBub3QgTm9uZSwgaXQgaXMgdGhlIG9sZCB0aXAgb2YgdGhlIGJyYW5jaCBiZWZvcmUKICAg
> ICAgICAgIyBpdCB3YXMgdXBkYXRlZCBmcm9tIHRoZSBtYXN0ZXIgYnJhbmNoLiBUaGlzIHNob3Vs
> ZCBiZWNvbWUgYSBwZW5kaW5nCiAgICAgICAgICMgbWVyZ2UgaW4gdGhlIHdvcmtpbmcgdHJlZSB0
> byBwcmVzZXJ2ZSB0aGUgdXNlciBleGlzdGluZyB3b3JrLiAgd2UKQEAgLTE2MDUsMTggKzE2MTIs
> MjMgQEAKICAgICAgICAgIyBsb2NhbCB3b3JrIGlzIHVucmVmZXJlbmNlZCBhbmQgd2lsbCBhcHBl
> YXIgdG8gaGF2ZSBiZWVuIGxvc3QuCiAgICAgICAgICMgCiAgICAgICAgIHJlc3VsdCA9IDAKLSAg
> ICAgICAgdHJ5OgotICAgICAgICAgICAgbGFzdF9yZXYgPSBzZWxmLmdldF9wYXJlbnRfaWRzKClb
> MF0KLSAgICAgICAgZXhjZXB0IEluZGV4RXJyb3I6Ci0gICAgICAgICAgICBsYXN0X3JldiA9IE5v
> bmUKLSAgICAgICAgaWYgbGFzdF9yZXYgIT0gc2VsZi5icmFuY2gubGFzdF9yZXZpc2lvbigpOgor
> ICAgICAgICBpZiByZXZpc2lvbiBpcyBOb25lOgorICAgICAgICAgICAgdHJ5OgorICAgICAgICAg
> ICAgICAgIGxhc3RfcmV2ID0gc2VsZi5nZXRfcGFyZW50X2lkcygpWzBdCisgICAgICAgICAgICBl
> eGNlcHQgSW5kZXhFcnJvcjoKKyAgICAgICAgICAgICAgICBsYXN0X3JldiA9IE5vbmUKKyAgICAg
> ICAgZWxzZToKKyAgICAgICAgICAgIGlmIHJldmlzaW9uIG5vdCBpbiBzZWxmLmJyYW5jaC5yZXZp
> c2lvbl9oaXN0b3J5KCk6CisgICAgICAgICAgICAgICAgcmFpc2UgZXJyb3JzLk5vU3VjaFJldmlz
> aW9uKHNlbGYuYnJhbmNoLCByZXZpc2lvbikKKyAgICAgICAgaWYgcmV2aXNpb24gIT0gc2VsZi5s
> YXN0X3JldmlzaW9uKCk6CiAgICAgICAgICAgICAjIG1lcmdlIHRyZWUgc3RhdGUgdXAgdG8gbmV3
> IGJyYW5jaCB0aXAuCiAgICAgICAgICAgICBiYXNpcyA9IHNlbGYuYmFzaXNfdHJlZSgpCi0gICAg
> ICAgICAgICB0b190cmVlID0gc2VsZi5icmFuY2guYmFzaXNfdHJlZSgpCisgICAgICAgICAgICB0
> b190cmVlID0gc2VsZi5icmFuY2gucmVwb3NpdG9yeS5yZXZpc2lvbl90cmVlKHJldmlzaW9uKQog
> ICAgICAgICAgICAgcmVzdWx0ICs9IG1lcmdlX2lubmVyKHNlbGYuYnJhbmNoLAogICAgICAgICAg
> ICAgICAgICAgICAgICAgICAgICAgICAgIHRvX3RyZWUsCiAgICAgICAgICAgICAgICAgICAgICAg
> ICAgICAgICAgICAgYmFzaXMsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGhp
> c190cmVlPXNlbGYpCisgICAgICAgICAgICBzZWxmLnNldF9sYXN0X3JldmlzaW9uKHJldmlzaW9u
> KQogICAgICAgICAgICAgIyBUT0RPIC0gZGVkdXAgcGFyZW50cyBsaXN0IHdpdGggdGhpbmdzIG1l
> cmdlZCBieSBwdWxsID8KICAgICAgICAgICAgICMgcmV1c2UgdGhlIHRyZWUgd2UndmUgdXBkYXRl
> ZCB0byB0byBzZXQgdGhlIGJhc2lzOgogICAgICAgICAgICAgcGFyZW50X3RyZWVzID0gWyhzZWxm
> LmJyYW5jaC5sYXN0X3JldmlzaW9uKCksIHRvX3RyZWUpXQpAQCAtMTY0Nyw3ICsxNjU5LDcgQEAK
> ICAgICAgICAgICAgICMgYW5kIHRoZSBub3cgcGVuZGluZyBtZXJnZQogICAgICAgICAgICAgZnJv
> bSBienJsaWIucmV2aXNpb24gaW1wb3J0IGNvbW1vbl9hbmNlc3RvcgogICAgICAgICAgICAgdHJ5
> OgotICAgICAgICAgICAgICAgIGJhc2VfcmV2X2lkID0gY29tbW9uX2FuY2VzdG9yKHNlbGYuYnJh
> bmNoLmxhc3RfcmV2aXNpb24oKSwKKyAgICAgICAgICAgICAgICBiYXNlX3Jldl9pZCA9IGNvbW1v
> bl9hbmNlc3RvcihyZXZpc2lvbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
> ICAgICAgICAgICBvbGRfdGlwLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
> ICAgICAgICAgIHNlbGYuYnJhbmNoLnJlcG9zaXRvcnkpCiAgICAgICAgICAgICBleGNlcHQgZXJy
> b3JzLk5vQ29tbW9uQW5jZXN0b3I6Cgo=
>
> # revision id: Matthieu.Moy at imag.fr-20060909165528-ac314e31493c5283
> # sha1: 495c6e9fc69a680d0d92350e757339b0ef130185
> # inventory sha1: 171321784e3d901eeccdb1cf33adf3eb3ad92ff3
> # parent ids:
> # Matthieu.Moy at imag.fr-20060909165020-5614051ef0d557f2
> # pqm at pqm.ubuntu.com-20060909160418-376f106672f0163b
> # properties:
> # branch-nick: bzr.update-r
>
> # message:
> # fix stupid error with _marker in prev patch
> # committer: Matthieu Moy <Matthieu.Moy at imag.fr>
> # date: Sat 2006-09-09 18:50:20.072000027 +0200
>
> === modified file bzrlib/workingtree.py // encoding:base64
> LS0tIGJ6cmxpYi93b3JraW5ndHJlZS5weQorKysgYnpybGliL3dvcmtpbmd0cmVlLnB5CkBAIC0x
> NTA2LDcgKzE1MDYsNyBAQAogICAgICAgICA6cGFyYW0gb2xkX3RpcDogSWYgYnJhbmNoLnVwZGF0
> ZSgpIGhhcyBhbHJlYWR5IGJlZW4gcnVuLCB0aGUgdmFsdWUgaXQgcmV0dXJuZWQgCiAgICAgICAg
> IChvbGQgdGlwIG9mIHRoZSBicmFuY2ggb3IgTm9uZSkuIF9tYXJrZXIgaXMgdXNlZCBvdGhlcndp
> c2UuCiAgICAgICAgICIiIgotICAgICAgICBpZiBvbGRfdGlwID09IF9tYXJrZXI6CisgICAgICAg
> IGlmIG9sZF90aXAgPT0gc2VsZi5fbWFya2VyOgogICAgICAgICAgICAgb2xkX3RpcCA9IHNlbGYu
> YnJhbmNoLnVwZGF0ZSgpCiAgICAgICAgICMgaGVyZSBpZiBvbGRfdGlwIGlzIG5vdCBOb25lLCBp
> dCBpcyB0aGUgb2xkIHRpcCBvZiB0aGUgYnJhbmNoIGJlZm9yZQogICAgICAgICAjIGl0IHdhcyB1
> cGRhdGVkIGZyb20gdGhlIG1hc3RlciBicmFuY2guIFRoaXMgc2hvdWxkIGJlY29tZSBhIHBlbmRp
> bmcKCg==
>
> # revision id: Matthieu.Moy at imag.fr-20060909165020-5614051ef0d557f2
> # sha1: 8a0a5aa5158eb5851dfdbf920ec186575a596b40
> # inventory sha1: 75b0ac5c9c612344cd9279429d927ee743cd0fcc
> # parent ids:
> # Matthieu.Moy at imag.fr-20060902121702-5a0c8b684bd58a57
> # properties:
> # branch-nick: bzr.update-r
>
> # message:
> # merge (with conflicts)
> # committer: Matthieu Moy <Matthieu.Moy at imag.fr>
> # date: Sat 2006-09-02 14:17:02.017999887 +0200
>
> === modified file bzrlib/builtins.py // encoding:base64
> LS0tIGJ6cmxpYi9idWlsdGlucy5weQorKysgYnpybGliL2J1aWx0aW5zLnB5CkBAIC04MTcsMjMg
> KzgxNyw0MyBAQAogICAgICdienIgcmV2ZXJ0JyBpbnN0ZWFkIG9mICdienIgY29tbWl0JyBhZnRl
> ciB0aGUgdXBkYXRlLgogICAgICIiIgogICAgIHRha2VzX2FyZ3MgPSBbJ2Rpcj8nXQorICAgIHRh
> a2VzX29wdGlvbnMgPSBbJ3JldmlzaW9uJ10KICAgICBhbGlhc2VzID0gWyd1cCddCiAKLSAgICBk
> ZWYgcnVuKHNlbGYsIGRpcj0nLicpOgorICAgIGRlZiBydW4oc2VsZiwgZGlyPScuJywgcmV2aXNp
> b249Tm9uZSk6CisgICAgICAgIGlmIHJldmlzaW9uIGlzIG5vdCBOb25lIGFuZCBsZW4ocmV2aXNp
> b24pICE9IDE6CisgICAgICAgICAgICByYWlzZSBCenJDb21tYW5kRXJyb3IoImJ6ciB1cGRhdGUg
> LS1yZXZpc2lvbiB0YWtlcyBleGFjdGx5IG9uZSByZXZpc2lvbiIpCiAgICAgICAgIHRyZWUgPSBX
> b3JraW5nVHJlZS5vcGVuX2NvbnRhaW5pbmcoZGlyKVswXQorICAgICAgICBicmFuY2ggPSB0cmVl
> LmJyYW5jaAogICAgICAgICB0cmVlLmxvY2tfd3JpdGUoKQogICAgICAgICB0cnk6CiAgICAgICAg
> ICAgICBleGlzdGluZ19wZW5kaW5nX21lcmdlcyA9IHRyZWUucGVuZGluZ19tZXJnZXMoKQotICAg
> ICAgICAgICAgbGFzdF9yZXYgPSB0cmVlLmxhc3RfcmV2aXNpb24oKQotICAgICAgICAgICAgaWYg
> bGFzdF9yZXYgPT0gdHJlZS5icmFuY2gubGFzdF9yZXZpc2lvbigpOgotICAgICAgICAgICAgICAg
> ICMgbWF5IGJlIHVwIHRvIGRhdGUsIGNoZWNrIG1hc3RlciB0b28uCi0gICAgICAgICAgICAgICAg
> bWFzdGVyID0gdHJlZS5icmFuY2guZ2V0X21hc3Rlcl9icmFuY2goKQotICAgICAgICAgICAgICAg
> IGlmIG1hc3RlciBpcyBOb25lIG9yIGxhc3RfcmV2ID09IG1hc3Rlci5sYXN0X3JldmlzaW9uKCk6
> Ci0gICAgICAgICAgICAgICAgICAgIHJldm5vID0gdHJlZS5icmFuY2gucmV2aXNpb25faWRfdG9f
> cmV2bm8obGFzdF9yZXYpCi0gICAgICAgICAgICAgICAgICAgIG5vdGUoIlRyZWUgaXMgdXAgdG8g
> ZGF0ZSBhdCByZXZpc2lvbiAlZC4iICUgKHJldm5vLCkpCi0gICAgICAgICAgICAgICAgICAgIHJl
> dHVybiAwCi0gICAgICAgICAgICBjb25mbGljdHMgPSB0cmVlLnVwZGF0ZSgpCi0gICAgICAgICAg
> ICByZXZubyA9IHRyZWUuYnJhbmNoLnJldmlzaW9uX2lkX3RvX3Jldm5vKHRyZWUubGFzdF9yZXZp
> c2lvbigpKQorICAgICAgICAgICAgIyBwb3RlbnRpYWxseSBnZXQgbmV3IHJldmlzaW9ucyBmcm9t
> IHRoZSBtYXN0ZXIgYnJhbmNoLgorICAgICAgICAgICAgIyBuZWVkZWQgZm9yIHRoZSBjYXNlIHdo
> ZXJlIC1yIE4gaXMgZ2l2ZW4sIHdpdGggTiBub3QgeWV0CisgICAgICAgICAgICAjIGluIHRoZSBs
> b2NhbCBicmFuY2ggZm9yIGEgaGVhdnl3ZWlnaHQgY2hlY2tvdXQuCisgICAgICAgICAgICBpZiBy
> ZXZpc2lvbiBpcyBub3QgTm9uZToKKyAgICAgICAgICAgICAgICB0cnk6CisgICAgICAgICAgICAg
> ICAgICAgIHJldiA9IHJldmlzaW9uWzBdLmluX2hpc3RvcnkoYnJhbmNoKS5yZXZfaWQKKyAgICAg
> ICAgICAgICAgICAgICAgIyBubyBuZWVkIHRvIHJ1biBicmFuY2gudXBkYXRlKCkKKyAgICAgICAg
> ICAgICAgICAgICAgb2xkX3RpcCA9IE5vbmUKKyAgICAgICAgICAgICAgICBleGNlcHQgZXJyb3Jz
> Lk5vU3VjaFJldmlzaW9uOgorICAgICAgICAgICAgICAgICAgICAjIHJldmlzaW9uIHdhcyBub3Qg
> dGhlcmUsIGJ1dCBpcyBtYXliZSBpbiB0aGUgbWFzdGVyLgorICAgICAgICAgICAgICAgICAgICBv
> bGRfdGlwID0gYnJhbmNoLnVwZGF0ZSgpCisgICAgICAgICAgICAgICAgICAgIHJldiA9IHJldmlz
> aW9uWzBdLmluX2hpc3RvcnkoYnJhbmNoKS5yZXZfaWQKKyAgICAgICAgICAgIGVsc2U6CisgICAg
> ICAgICAgICAgICAgb2xkX3RpcCA9IGJyYW5jaC51cGRhdGUoKQorICAgICAgICAgICAgICAgIHJl
> diA9IGJyYW5jaC5sYXN0X3JldmlzaW9uKCkKKyAgICAgICAgICAgIGlmIHRyZWUubGFzdF9yZXZp
> c2lvbigpID09IHJldjoKKyAgICAgICAgICAgICAgICByZXZubyA9IGJyYW5jaC5yZXZpc2lvbl9p
> ZF90b19yZXZubyhyZXYpCisgICAgICAgICAgICAgICAgbm90ZSgiVHJlZSBpcyB1cCB0byBkYXRl
> IGF0IHJldmlzaW9uICVkLiIgJSAocmV2bm8sKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gMAor
> ICAgICAgICAgICAgdHJ5OgorICAgICAgICAgICAgICAgIGNvbmZsaWN0cyA9IHRyZWUudXBkYXRl
> KHJldiwgb2xkX3RpcCkKKyAgICAgICAgICAgIGV4Y2VwdCBlcnJvcnMuTm9TdWNoUmV2aXNpb24s
> IGU6CisgICAgICAgICAgICAgICAgcmFpc2UgQnpyQ29tbWFuZEVycm9yKCJicmFuY2ggaGFzIG5v
> IHJldmlzaW9uICVzXG4iCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJi
> enIgdXBkYXRlIC0tcmV2aXNpb24gd29ya3Mgb25seSBmb3IgYSByZXZpc2lvbiBpbiB0aGUgYnJh
> bmNoIGhpc3RvcnkiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICUgKGUu
> cmV2aXNpb24pKQorICAgICAgICAgICAgcmV2bm8gPSBicmFuY2gucmV2aXNpb25faWRfdG9fcmV2
> bm8odHJlZS5sYXN0X3JldmlzaW9uKCkpCiAgICAgICAgICAgICBub3RlKCdVcGRhdGVkIHRvIHJl
> dmlzaW9uICVkLicgJSAocmV2bm8sKSkKICAgICAgICAgICAgIGlmIHRyZWUucGVuZGluZ19tZXJn
> ZXMoKSAhPSBleGlzdGluZ19wZW5kaW5nX21lcmdlczoKICAgICAgICAgICAgICAgICBub3RlKCdZ
> b3VyIGxvY2FsIGNvbW1pdHMgd2lsbCBub3cgc2hvdyBhcyBwZW5kaW5nIG1lcmdlcyB3aXRoICcK
> Cg==
>
> === modified file bzrlib/tests/blackbox/test_update.py // encoding:base64
> LS0tIGJ6cmxpYi90ZXN0cy9ibGFja2JveC90ZXN0X3VwZGF0ZS5weQorKysgYnpybGliL3Rlc3Rz
> L2JsYWNrYm94L3Rlc3RfdXBkYXRlLnB5CkBAIC0xOTcsMyArMTk3LDczIEBACiAKICAgICAgICAg
> IyBUaGUgcGVuZGluZyBtZXJnZXMgc2hvdWxkIHN0aWxsIGJlIHRoZXJlCiAgICAgICAgIHNlbGYu
> YXNzZXJ0RXF1YWwoWydvMiddLCBjaGVja291dDEuZ2V0X3BhcmVudF9pZHMoKVsxOl0pCisKKyAg
> ICBkZWYgdGVzdF91cGRhdGVfZGFzaF9yKHNlbGYpOgorICAgICAgICAjIFRlc3QgdGhhdCAnYnpy
> IHVwZGF0ZScgd29ya3MgY29ycmVjdGx5IHdoZW4geW91IGhhdmUKKyAgICAgICAgIyBhbiB1cGRh
> dGUgaW4gdGhlIG1hc3RlciB0cmVlLCBhbmQgYSBsaWdodHdlaWdodCBjaGVja291dAorICAgICAg
> ICAjIHdoaWNoIGhhcyBtZXJnZWQgYW5vdGhlciBicmFuY2gKKyAgICAgICAgbWFzdGVyID0gc2Vs
> Zi5tYWtlX2JyYW5jaF9hbmRfdHJlZSgnbWFzdGVyJykKKyAgICAgICAgb3MuY2hkaXIoJ21hc3Rl
> cicpCisgICAgICAgIHNlbGYuYnVpbGRfdHJlZShbJy4vZmlsZTEnXSkKKyAgICAgICAgbWFzdGVy
> LmFkZChbJ2ZpbGUxJ10pCisgICAgICAgIG1hc3Rlci5jb21taXQoJ29uZScsIHJldl9pZD0nbTEn
> KQorICAgICAgICBzZWxmLmJ1aWxkX3RyZWUoWycuL2ZpbGUyJ10pCisgICAgICAgIG1hc3Rlci5h
> ZGQoWydmaWxlMiddKQorICAgICAgICBtYXN0ZXIuY29tbWl0KCd0d28nLCByZXZfaWQ9J20yJykK
> KyAgICAgICAgCisgICAgICAgIG91dCwgZXJyID0gc2VsZi5ydW5fYnpyKCd1cGRhdGUnLCAnLXIn
> LCAnMScpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJycsIG91dCkKKyAgICAgICAgc2VsZi5h
> c3NlcnRFcXVhbCgnQWxsIGNoYW5nZXMgYXBwbGllZCBzdWNjZXNzZnVsbHkuXG4nCisgICAgICAg
> ICAgICAgICAgICAgICAgICAgJ1VwZGF0ZWQgdG8gcmV2aXNpb24gMS5cbicsIGVycikKKyAgICAg
> ICAgc2VsZi5mYWlsVW5sZXNzRXhpc3RzKCcuL2ZpbGUxJykKKyAgICAgICAgc2VsZi5mYWlsSWZF
> eGlzdHMoJy4vZmlsZTInKQorICAgICAgICBzZWxmLmNoZWNrX2ZpbGVfY29udGVudHMoJy5ienIv
> Y2hlY2tvdXQvbGFzdC1yZXZpc2lvbicsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
> ICAnbTEnKQorCisgICAgZGVmIHRlc3RfdXBkYXRlX2Rhc2hfcl9vdXRzaWRlX2hpc3Rvcnkoc2Vs
> Zik6CisgICAgICAgICMgVGVzdCB0aGF0ICdienIgdXBkYXRlJyB3b3JrcyBjb3JyZWN0bHkgd2hl
> biB5b3UgaGF2ZQorICAgICAgICAjIGFuIHVwZGF0ZSBpbiB0aGUgbWFzdGVyIHRyZWUsIGFuZCBh
> IGxpZ2h0d2VpZ2h0IGNoZWNrb3V0CisgICAgICAgICMgd2hpY2ggaGFzIG1lcmdlZCBhbm90aGVy
> IGJyYW5jaAorICAgICAgICBtYXN0ZXIgPSBzZWxmLm1ha2VfYnJhbmNoX2FuZF90cmVlKCdtYXN0
> ZXInKQorICAgICAgICBzZWxmLmJ1aWxkX3RyZWUoWydtYXN0ZXIvZmlsZTEnXSkKKyAgICAgICAg
> bWFzdGVyLmFkZChbJ2ZpbGUxJ10pCisgICAgICAgIG1hc3Rlci5jb21taXQoJ29uZScsIHJldl9p
> ZD0nbTEnKQorCisgICAgICAgICMgQ3JlYXRlIGEgc2Vjb25kIGJyYW5jaCwgd2l0aCBhbiBleHRy
> YSBjb21taXQKKyAgICAgICAgb3RoZXIgPSBtYXN0ZXIuYnpyZGlyLnNwcm91dCgnb3RoZXInKS5v
> cGVuX3dvcmtpbmd0cmVlKCkKKyAgICAgICAgc2VsZi5idWlsZF90cmVlKFsnb3RoZXIvZmlsZTIn
> XSkKKyAgICAgICAgb3RoZXIuYWRkKFsnZmlsZTInXSkKKyAgICAgICAgb3RoZXIuY29tbWl0KCdv
> dGhlcjInLCByZXZfaWQ9J28yJykKKworICAgICAgICBvcy5jaGRpcignbWFzdGVyJykKKyAgICAg
> ICAgc2VsZi5ydW5fYnpyKCdtZXJnZScsICcuLi9vdGhlcicpCisgICAgICAgIG1hc3Rlci5jb21t
> aXQoJ21lcmdlJywgcmV2X2lkPSdtZXJnZScpCisKKyAgICAgICAgb3V0LCBlcnIgPSBzZWxmLnJ1
> bl9ienIoJ3VwZGF0ZScsICctcicsICdyZXZpZDpvMicsCisgICAgICAgICAgICAgICAgICAgICAg
> ICAgICAgICAgIHJldGNvZGU9MykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnJywgb3V0KQor
> ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCdienI6IEVSUk9SOiBicmFuY2ggaGFzIG5vIHJldmlz
> aW9uIG8yXG4nCisgICAgICAgICAgICAgICAgICAgICAgICAgJ2J6ciB1cGRhdGUgLS1yZXZpc2lv
> biB3b3JrcyBvbmx5JworICAgICAgICAgICAgICAgICAgICAgICAgICcgZm9yIGEgcmV2aXNpb24g
> aW4gdGhlIGJyYW5jaCBoaXN0b3J5XG4nLAorICAgICAgICAgICAgICAgICAgICAgICAgIGVycikK
> KworICAgIGRlZiB0ZXN0X3VwZGF0ZV9kYXNoX3JfaW5fbWFzdGVyKHNlbGYpOgorICAgICAgICAj
> IFRlc3QgdGhhdCAnYnpyIHVwZGF0ZScgd29ya3MgY29ycmVjdGx5IHdoZW4geW91IGhhdmUKKyAg
> ICAgICAgIyBhbiB1cGRhdGUgaW4gdGhlIG1hc3RlciB0cmVlLAorICAgICAgICBtYXN0ZXIgPSBz
> ZWxmLm1ha2VfYnJhbmNoX2FuZF90cmVlKCdtYXN0ZXInKQorICAgICAgICBzZWxmLmJ1aWxkX3Ry
> ZWUoWydtYXN0ZXIvZmlsZTEnXSkKKyAgICAgICAgbWFzdGVyLmFkZChbJ2ZpbGUxJ10pCisgICAg
> ICAgIG1hc3Rlci5jb21taXQoJ29uZScsIHJldl9pZD0nbTEnKQorCisgICAgICAgIHNlbGYucnVu
> X2J6cignY2hlY2tvdXQnLCAnbWFzdGVyJywgJ2NoZWNrb3V0JykKKworICAgICAgICAjIGFkZCBh
> IHJldmlzaW9uIGluIHRoZSBtYXN0ZXIuCisgICAgICAgIHNlbGYuYnVpbGRfdHJlZShbJ21hc3Rl
> ci9maWxlMiddKQorICAgICAgICBtYXN0ZXIuYWRkKFsnZmlsZTInXSkKKyAgICAgICAgbWFzdGVy
> LmNvbW1pdCgndHdvJywgcmV2X2lkPSdtMicpCisKKyAgICAgICAgb3MuY2hkaXIoJ2NoZWNrb3V0
> JykKKyAgICAgICAgb3V0LCBlcnIgPSBzZWxmLnJ1bl9ienIoJ3VwZGF0ZScsICctcicsICdyZXZp
> ZDptMicpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJycsIG91dCkKKyAgICAgICAgc2VsZi5h
> c3NlcnRFcXVhbCgnQWxsIGNoYW5nZXMgYXBwbGllZCBzdWNjZXNzZnVsbHkuXG4nCisgICAgICAg
> ICAgICAgICAgICAgICAgICAgJ1VwZGF0ZWQgdG8gcmV2aXNpb24gMi5cbicsIGVycikKCg==
>
> === modified file bzrlib/workingtree.py // encoding:base64
> LS0tIGJ6cmxpYi93b3JraW5ndHJlZS5weQorKysgYnpybGliL3dvcmtpbmd0cmVlLnB5CkBAIC0x
> NDgwLDggKzE0ODAsMTAgQEAKICAgICAgICAgIiIiCiAgICAgICAgIHJhaXNlIE5vdEltcGxlbWVu
> dGVkRXJyb3Ioc2VsZi51bmxvY2spCiAKKyAgICBfbWFya2VyID0gb2JqZWN0KCkKKwogICAgIEBu
> ZWVkc193cml0ZV9sb2NrCi0gICAgZGVmIHVwZGF0ZShzZWxmKToKKyAgICBkZWYgdXBkYXRlKHNl
> bGYsIHJldmlzaW9uPU5vbmUsIG9sZF90aXA9X21hcmtlcik6CiAgICAgICAgICIiIlVwZGF0ZSBh
> IHdvcmtpbmcgdHJlZSBhbG9uZyBpdHMgYnJhbmNoLgogCiAgICAgICAgIFRoaXMgd2lsbCB1cGRh
> dGUgdGhlIGJyYW5jaCBpZiBpdHMgYm91bmQgdG9vLCB3aGljaCBtZWFucyB3ZSBoYXZlIG11bHRp
> cGxlIHRyZWVzIGludm9sdmVkOgpAQCAtMTQ5OSw4ICsxNTAxLDEzIEBACiAgICAgICAgIFRoZXJl
> IGlzbid0IGEgc2luZ2xlIG9wZXJhdGlvbiBhdCB0aGUgbW9tZW50IHRvIGRvIHRoYXQsIHNvIHdl
> OgogICAgICAgICBNZXJnZSBjdXJyZW50IHN0YXRlIC0+IGJhc2lzIHRyZWUgb2YgdGhlIG1hc3Rl
> ciB3LnIudC4gdGhlIG9sZCB0cmVlIGJhc2lzLgogICAgICAgICBEbyBhICdub3JtYWwnIG1lcmdl
> IG9mIHRoZSBvbGQgYnJhbmNoIGJhc2lzIGlmIGl0IGlzIHJlbGV2YW50LgorCisgICAgICAgIDpw
> YXJhbSByZXZpc2lvbjogVGhlIHRhcmdldCByZXZpc2lvbiB0byB1cGRhdGUgdG8uIE11c3QgYmUg
> aW4gdGhlIHJldmlzaW9uIGhpc3RvcnkuCisgICAgICAgIDpwYXJhbSBvbGRfdGlwOiBJZiBicmFu
> Y2gudXBkYXRlKCkgaGFzIGFscmVhZHkgYmVlbiBydW4sIHRoZSB2YWx1ZSBpdCByZXR1cm5lZCAK
> KyAgICAgICAgKG9sZCB0aXAgb2YgdGhlIGJyYW5jaCBvciBOb25lKS4gX21hcmtlciBpcyB1c2Vk
> IG90aGVyd2lzZS4KICAgICAgICAgIiIiCi0gICAgICAgIG9sZF90aXAgPSBzZWxmLmJyYW5jaC51
> cGRhdGUoKQorICAgICAgICBpZiBvbGRfdGlwID09IF9tYXJrZXI6CisgICAgICAgICAgICBvbGRf
> dGlwID0gc2VsZi5icmFuY2gudXBkYXRlKCkKICAgICAgICAgIyBoZXJlIGlmIG9sZF90aXAgaXMg
> bm90IE5vbmUsIGl0IGlzIHRoZSBvbGQgdGlwIG9mIHRoZSBicmFuY2ggYmVmb3JlCiAgICAgICAg
> ICMgaXQgd2FzIHVwZGF0ZWQgZnJvbSB0aGUgbWFzdGVyIGJyYW5jaC4gVGhpcyBzaG91bGQgYmVj
> b21lIGEgcGVuZGluZwogICAgICAgICAjIG1lcmdlIGluIHRoZSB3b3JraW5nIHRyZWUgdG8gcHJl
> c2VydmUgdGhlIHVzZXIgZXhpc3Rpbmcgd29yay4gIHdlCkBAIC0xNTEyLDE0ICsxNTE5LDIxIEBA
> CiAgICAgICAgICMgbG9jYWwgd29yayBpcyB1bnJlZmVyZW5jZWQgYW5kIHdpbGwgYXBwZWFyIHRv
> IGhhdmUgYmVlbiBsb3N0LgogICAgICAgICAjIAogICAgICAgICByZXN1bHQgPSAwCi0gICAgICAg
> IGlmIHNlbGYubGFzdF9yZXZpc2lvbigpICE9IHNlbGYuYnJhbmNoLmxhc3RfcmV2aXNpb24oKToK
> KyAgICAgICAgaWYgcmV2aXNpb24gaXMgTm9uZToKKyAgICAgICAgICAgIHJldmlzaW9uID0gc2Vs
> Zi5icmFuY2gubGFzdF9yZXZpc2lvbigpCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBpZiBy
> ZXZpc2lvbiBub3QgaW4gc2VsZi5icmFuY2gucmV2aXNpb25faGlzdG9yeSgpOgorICAgICAgICAg
> ICAgICAgIHJhaXNlIGVycm9ycy5Ob1N1Y2hSZXZpc2lvbihzZWxmLmJyYW5jaCwgcmV2aXNpb24p
> CisKKyAgICAgICAgaWYgc2VsZi5sYXN0X3JldmlzaW9uKCkgIT0gcmV2aXNpb246CiAgICAgICAg
> ICAgICAjIG1lcmdlIHRyZWUgc3RhdGUgdXAgdG8gbmV3IGJyYW5jaCB0aXAuCiAgICAgICAgICAg
> ICBiYXNpcyA9IHNlbGYuYmFzaXNfdHJlZSgpCi0gICAgICAgICAgICB0b190cmVlID0gc2VsZi5i
> cmFuY2guYmFzaXNfdHJlZSgpCisgICAgICAgICAgICB0b190cmVlID0gc2VsZi5icmFuY2gucmVw
> b3NpdG9yeS5yZXZpc2lvbl90cmVlKHJldmlzaW9uKQogICAgICAgICAgICAgcmVzdWx0ICs9IG1l
> cmdlX2lubmVyKHNlbGYuYnJhbmNoLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
> IHRvX3RyZWUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYmFzaXMsCiAgICAg
> ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGhpc190cmVlPXNlbGYpCisgICAgICAgICAg
> ICBzZWxmLnNldF9sYXN0X3JldmlzaW9uKHJldmlzaW9uKQogICAgICAgICAgICAgIyBUT0RPIC0g
> ZGVkdXAgcGFyZW50cyBsaXN0IHdpdGggdGhpbmdzIG1lcmdlZCBieSBwdWxsID8KICAgICAgICAg
> ICAgICMgcmV1c2UgdGhlIHRyZWUgd2UndmUgdXBkYXRlZCB0byB0byBzZXQgdGhlIGJhc2lzOgog
> ICAgICAgICAgICAgcGFyZW50X3RyZWVzID0gWyhzZWxmLmJyYW5jaC5sYXN0X3JldmlzaW9uKCks
> IHRvX3RyZWUpXQpAQCAtMTU0OSw3ICsxNTYzLDcgQEAKICAgICAgICAgICAgICMgYW5kIHRoZSBu
> b3cgcGVuZGluZyBtZXJnZQogICAgICAgICAgICAgZnJvbSBienJsaWIucmV2aXNpb24gaW1wb3J0
> IGNvbW1vbl9hbmNlc3RvcgogICAgICAgICAgICAgdHJ5OgotICAgICAgICAgICAgICAgIGJhc2Vf
> cmV2X2lkID0gY29tbW9uX2FuY2VzdG9yKHNlbGYuYnJhbmNoLmxhc3RfcmV2aXNpb24oKSwKKyAg
> ICAgICAgICAgICAgICBiYXNlX3Jldl9pZCA9IGNvbW1vbl9hbmNlc3RvcihyZXZpc2lvbiwKICAg
> ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvbGRfdGlwLAogICAg
> ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuYnJhbmNoLnJl
> cG9zaXRvcnkpCiAgICAgICAgICAgICBleGNlcHQgZXJyb3JzLk5vQ29tbW9uQW5jZXN0b3I6Cgo=
>
> # revision id: Matthieu.Moy at imag.fr-20060902121702-5a0c8b684bd58a57
> # sha1: c805d8e4d72e4c7060c7e78292163ad4278ec7ca
> # inventory sha1: 63d946cf11efb5e606976efea1d718e919aaf969
> # parent ids:
> # Matthieu.Moy at imag.fr-20060902115913-d6714d4c4bf1ddd7
> # pqm at pqm.ubuntu.com-20060901173735-543e9acad03760d1
> # properties:
> # branch-nick: bzr.update-r
>
> # message:
> # Coding style fixes thanks to jam.
> #
> # committer: Matthieu Moy <Matthieu.Moy at imag.fr>
> # date: Sat 2006-09-02 13:59:13.507999897 +0200
>
> === modified file bzrlib/builtins.py // encoding:base64
> LS0tIGJ6cmxpYi9idWlsdGlucy5weQorKysgYnpybGliL2J1aWx0aW5zLnB5CkBAIC04MjQsNyAr
> ODI0LDcgQEAKICAgICAgICAgaWYgcmV2aXNpb24gaXMgbm90IE5vbmUgYW5kIGxlbihyZXZpc2lv
> bikgIT0gMToKICAgICAgICAgICAgIHJhaXNlIEJ6ckNvbW1hbmRFcnJvcigiYnpyIHVwZGF0ZSAt
> LXJldmlzaW9uIHRha2VzIGV4YWN0bHkgb25lIHJldmlzaW9uIikKICAgICAgICAgdHJlZSA9IFdv
> cmtpbmdUcmVlLm9wZW5fY29udGFpbmluZyhkaXIpWzBdCi0gICAgICAgIGIgPSB0cmVlLmJyYW5j
> aAorICAgICAgICBicmFuY2ggPSB0cmVlLmJyYW5jaAogICAgICAgICB0cmVlLmxvY2tfd3JpdGUo
> KQogICAgICAgICB0cnk6CiAgICAgICAgICAgICBleGlzdGluZ19wZW5kaW5nX21lcmdlcyA9IHRy
> ZWUucGVuZGluZ19tZXJnZXMoKQpAQCAtODMzLDI3ICs4MzMsMjcgQEAKICAgICAgICAgICAgICMg
> aW4gdGhlIGxvY2FsIGJyYW5jaCBmb3IgYSBoZWF2eXdlaWdodCBjaGVja291dC4KICAgICAgICAg
> ICAgIGlmIHJldmlzaW9uIGlzIG5vdCBOb25lOgogICAgICAgICAgICAgICAgIHRyeToKLSAgICAg
> ICAgICAgICAgICAgICAgcmV2ID0gcmV2aXNpb25bMF0uaW5faGlzdG9yeShiKS5yZXZfaWQKKyAg
> ICAgICAgICAgICAgICAgICAgcmV2ID0gcmV2aXNpb25bMF0uaW5faGlzdG9yeShicmFuY2gpLnJl
> dl9pZAogICAgICAgICAgICAgICAgICAgICAjIG5vIG5lZWQgdG8gcnVuIGJyYW5jaC51cGRhdGUo
> KQotICAgICAgICAgICAgICAgICAgICBvbGRfdGlwPU5vbmUKKyAgICAgICAgICAgICAgICAgICAg
> b2xkX3RpcCA9IE5vbmUKICAgICAgICAgICAgICAgICBleGNlcHQgZXJyb3JzLk5vU3VjaFJldmlz
> aW9uOgogICAgICAgICAgICAgICAgICAgICAjIHJldmlzaW9uIHdhcyBub3QgdGhlcmUsIGJ1dCBp
> cyBtYXliZSBpbiB0aGUgbWFzdGVyLgotICAgICAgICAgICAgICAgICAgICBvbGRfdGlwID0gYi51
> cGRhdGUoKQotICAgICAgICAgICAgICAgICAgICByZXYgPSByZXZpc2lvblswXS5pbl9oaXN0b3J5
> KGIpLnJldl9pZAorICAgICAgICAgICAgICAgICAgICBvbGRfdGlwID0gYnJhbmNoLnVwZGF0ZSgp
> CisgICAgICAgICAgICAgICAgICAgIHJldiA9IHJldmlzaW9uWzBdLmluX2hpc3RvcnkoYnJhbmNo
> KS5yZXZfaWQKICAgICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAgb2xkX3RpcCA9IGIu
> dXBkYXRlKCkKLSAgICAgICAgICAgICAgICByZXYgPSBiLmxhc3RfcmV2aXNpb24oKQorICAgICAg
> ICAgICAgICAgIG9sZF90aXAgPSBicmFuY2gudXBkYXRlKCkKKyAgICAgICAgICAgICAgICByZXYg
> PSBicmFuY2gubGFzdF9yZXZpc2lvbigpCiAgICAgICAgICAgICBpZiB0cmVlLmxhc3RfcmV2aXNp
> b24oKSA9PSByZXY6Ci0gICAgICAgICAgICAgICAgcmV2bm8gPSBiLnJldmlzaW9uX2lkX3RvX3Jl
> dm5vKHJldikKKyAgICAgICAgICAgICAgICByZXZubyA9IGJyYW5jaC5yZXZpc2lvbl9pZF90b19y
> ZXZubyhyZXYpCiAgICAgICAgICAgICAgICAgbm90ZSgiVHJlZSBpcyB1cCB0byBkYXRlIGF0IHJl
> dmlzaW9uICVkLiIgJSAocmV2bm8sKSkKICAgICAgICAgICAgICAgICByZXR1cm4gMAogICAgICAg
> ICAgICAgdHJ5OgotICAgICAgICAgICAgICAgIGNvbmZsaWN0cyA9IHRyZWUudXBkYXRlKHJldixv
> bGRfdGlwKQorICAgICAgICAgICAgICAgIGNvbmZsaWN0cyA9IHRyZWUudXBkYXRlKHJldiwgb2xk
> X3RpcCkKICAgICAgICAgICAgIGV4Y2VwdCBlcnJvcnMuTm9TdWNoUmV2aXNpb24sIGU6CiAgICAg
> ICAgICAgICAgICAgcmFpc2UgQnpyQ29tbWFuZEVycm9yKCJicmFuY2ggaGFzIG5vIHJldmlzaW9u
> ICVzXG4iCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJienIgdXBkYXRl
> IC0tcmV2aXNpb24gd29ya3Mgb25seSBmb3IgYSByZXZpc2lvbiBpbiB0aGUgYnJhbmNoIGhpc3Rv
> cnkiCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICUgKGUucmV2aXNpb24p
> KQotICAgICAgICAgICAgcmV2bm8gPSBiLnJldmlzaW9uX2lkX3RvX3Jldm5vKHRyZWUubGFzdF9y
> ZXZpc2lvbigpKQorICAgICAgICAgICAgcmV2bm8gPSBicmFuY2gucmV2aXNpb25faWRfdG9fcmV2
> bm8odHJlZS5sYXN0X3JldmlzaW9uKCkpCiAgICAgICAgICAgICBub3RlKCdVcGRhdGVkIHRvIHJl
> dmlzaW9uICVkLicgJSAocmV2bm8sKSkKICAgICAgICAgICAgIGlmIHRyZWUucGVuZGluZ19tZXJn
> ZXMoKSAhPSBleGlzdGluZ19wZW5kaW5nX21lcmdlczoKICAgICAgICAgICAgICAgICBub3RlKCdZ
> b3VyIGxvY2FsIGNvbW1pdHMgd2lsbCBub3cgc2hvdyBhcyBwZW5kaW5nIG1lcmdlcyB3aXRoICcK
> Cg==
>
> === modified file bzrlib/workingtree.py // encoding:base64
> LS0tIGJ6cmxpYi93b3JraW5ndHJlZS5weQorKysgYnpybGliL3dvcmtpbmd0cmVlLnB5CkBAIC0x
> MzgyLDggKzEzODIsMTAgQEAKICAgICAgICAgIiIiCiAgICAgICAgIHJhaXNlIE5vdEltcGxlbWVu
> dGVkRXJyb3Ioc2VsZi51bmxvY2spCiAKKyAgICBfbWFya2VyID0gb2JqZWN0KCkKKwogICAgIEBu
> ZWVkc193cml0ZV9sb2NrCi0gICAgZGVmIHVwZGF0ZShzZWxmLHJldmlzaW9uPU5vbmUsb2xkX3Rp
> cD0wKToKKyAgICBkZWYgdXBkYXRlKHNlbGYsIHJldmlzaW9uPU5vbmUsIG9sZF90aXA9X21hcmtl
> cik6CiAgICAgICAgICIiIlVwZGF0ZSBhIHdvcmtpbmcgdHJlZSBhbG9uZyBpdHMgYnJhbmNoLgog
> CiAgICAgICAgIFRoaXMgd2lsbCB1cGRhdGUgdGhlIGJyYW5jaCBpZiBpdHMgYm91bmQgdG9vLCB3
> aGljaCBtZWFucyB3ZSBoYXZlIG11bHRpcGxlIHRyZWVzIGludm9sdmVkOgpAQCAtMTQwNCw5ICsx
> NDA2LDkgQEAKIAogICAgICAgICA6cGFyYW0gcmV2aXNpb246IFRoZSB0YXJnZXQgcmV2aXNpb24g
> dG8gdXBkYXRlIHRvLiBNdXN0IGJlIGluIHRoZSByZXZpc2lvbiBoaXN0b3J5LgogICAgICAgICA6
> cGFyYW0gb2xkX3RpcDogSWYgYnJhbmNoLnVwZGF0ZSgpIGhhcyBhbHJlYWR5IGJlZW4gcnVuLCB0
> aGUgdmFsdWUgaXQgcmV0dXJuZWQgCi0gICAgICAgIChvbGQgdGlwIG9mIHRoZSBicmFuY2ggb3Ig
> bmlsKS4gT3RoZXJ3aXNlLCB0aGUgbnVtYmVyIDAuCisgICAgICAgIChvbGQgdGlwIG9mIHRoZSBi
> cmFuY2ggb3IgTm9uZSkuIF9tYXJrZXIgaXMgdXNlZCBvdGhlcndpc2UuCiAgICAgICAgICIiIgot
> ICAgICAgICBpZiBvbGRfdGlwID09IDA6CisgICAgICAgIGlmIG9sZF90aXAgPT0gX21hcmtlcjoK
> ICAgICAgICAgICAgIG9sZF90aXAgPSBzZWxmLmJyYW5jaC51cGRhdGUoKQogICAgICAgICBpZiBv
> bGRfdGlwIGlzIG5vdCBOb25lOgogICAgICAgICAgICAgc2VsZi5hZGRfcGVuZGluZ19tZXJnZShv
> bGRfdGlwKQoK
>
> # revision id: Matthieu.Moy at imag.fr-20060902115913-d6714d4c4bf1ddd7
> # sha1: dcb2012d251041149598e710d4201f8a09727f3c
> # inventory sha1: 1ab5d4b1b664d750491b550f1ab065d20264c424
> # parent ids:
> # Matthieu.Moy at imag.fr-20060828053533-d243b368e9306f39
> # properties:
> # branch-nick: bzr.update-r
>
> # message:
> # merge
> # committer: Matthieu Moy <Matthieu.Moy at imag.fr>
> # date: Mon 2006-08-28 07:35:33.555999994 +0200
>
> === modified file bzrlib/builtins.py // encoding:base64
> LS0tIGJ6cmxpYi9idWlsdGlucy5weQorKysgYnpybGliL2J1aWx0aW5zLnB5CkBAIC04MTcsMjMg
> KzgxNyw0MyBAQAogICAgICdienIgcmV2ZXJ0JyBpbnN0ZWFkIG9mICdienIgY29tbWl0JyBhZnRl
> ciB0aGUgdXBkYXRlLgogICAgICIiIgogICAgIHRha2VzX2FyZ3MgPSBbJ2Rpcj8nXQorICAgIHRh
> a2VzX29wdGlvbnMgPSBbJ3JldmlzaW9uJ10KICAgICBhbGlhc2VzID0gWyd1cCddCiAKLSAgICBk
> ZWYgcnVuKHNlbGYsIGRpcj0nLicpOgorICAgIGRlZiBydW4oc2VsZiwgZGlyPScuJywgcmV2aXNp
> b249Tm9uZSk6CisgICAgICAgIGlmIHJldmlzaW9uIGlzIG5vdCBOb25lIGFuZCBsZW4ocmV2aXNp
> b24pICE9IDE6CisgICAgICAgICAgICByYWlzZSBCenJDb21tYW5kRXJyb3IoImJ6ciB1cGRhdGUg
> LS1yZXZpc2lvbiB0YWtlcyBleGFjdGx5IG9uZSByZXZpc2lvbiIpCiAgICAgICAgIHRyZWUgPSBX
> b3JraW5nVHJlZS5vcGVuX2NvbnRhaW5pbmcoZGlyKVswXQorICAgICAgICBiID0gdHJlZS5icmFu
> Y2gKICAgICAgICAgdHJlZS5sb2NrX3dyaXRlKCkKICAgICAgICAgdHJ5OgogICAgICAgICAgICAg
> ZXhpc3RpbmdfcGVuZGluZ19tZXJnZXMgPSB0cmVlLnBlbmRpbmdfbWVyZ2VzKCkKLSAgICAgICAg
> ICAgIGxhc3RfcmV2ID0gdHJlZS5sYXN0X3JldmlzaW9uKCkKLSAgICAgICAgICAgIGlmIGxhc3Rf
> cmV2ID09IHRyZWUuYnJhbmNoLmxhc3RfcmV2aXNpb24oKToKLSAgICAgICAgICAgICAgICAjIG1h
> eSBiZSB1cCB0byBkYXRlLCBjaGVjayBtYXN0ZXIgdG9vLgotICAgICAgICAgICAgICAgIG1hc3Rl
> ciA9IHRyZWUuYnJhbmNoLmdldF9tYXN0ZXJfYnJhbmNoKCkKLSAgICAgICAgICAgICAgICBpZiBt
> YXN0ZXIgaXMgTm9uZSBvciBsYXN0X3JldiA9PSBtYXN0ZXIubGFzdF9yZXZpc2lvbigpOgotICAg
> ICAgICAgICAgICAgICAgICByZXZubyA9IHRyZWUuYnJhbmNoLnJldmlzaW9uX2lkX3RvX3Jldm5v
> KGxhc3RfcmV2KQotICAgICAgICAgICAgICAgICAgICBub3RlKCJUcmVlIGlzIHVwIHRvIGRhdGUg
> YXQgcmV2aXNpb24gJWQuIiAlIChyZXZubywpKQotICAgICAgICAgICAgICAgICAgICByZXR1cm4g
> MAotICAgICAgICAgICAgY29uZmxpY3RzID0gdHJlZS51cGRhdGUoKQotICAgICAgICAgICAgcmV2
> bm8gPSB0cmVlLmJyYW5jaC5yZXZpc2lvbl9pZF90b19yZXZubyh0cmVlLmxhc3RfcmV2aXNpb24o
> KSkKKyAgICAgICAgICAgICMgcG90ZW50aWFsbHkgZ2V0IG5ldyByZXZpc2lvbnMgZnJvbSB0aGUg
> bWFzdGVyIGJyYW5jaC4KKyAgICAgICAgICAgICMgbmVlZGVkIGZvciB0aGUgY2FzZSB3aGVyZSAt
> ciBOIGlzIGdpdmVuLCB3aXRoIE4gbm90IHlldAorICAgICAgICAgICAgIyBpbiB0aGUgbG9jYWwg
> YnJhbmNoIGZvciBhIGhlYXZ5d2VpZ2h0IGNoZWNrb3V0LgorICAgICAgICAgICAgaWYgcmV2aXNp
> b24gaXMgbm90IE5vbmU6CisgICAgICAgICAgICAgICAgdHJ5OgorICAgICAgICAgICAgICAgICAg
> ICByZXYgPSByZXZpc2lvblswXS5pbl9oaXN0b3J5KGIpLnJldl9pZAorICAgICAgICAgICAgICAg
> ICAgICAjIG5vIG5lZWQgdG8gcnVuIGJyYW5jaC51cGRhdGUoKQorICAgICAgICAgICAgICAgICAg
> ICBvbGRfdGlwPU5vbmUKKyAgICAgICAgICAgICAgICBleGNlcHQgZXJyb3JzLk5vU3VjaFJldmlz
> aW9uOgorICAgICAgICAgICAgICAgICAgICAjIHJldmlzaW9uIHdhcyBub3QgdGhlcmUsIGJ1dCBp
> cyBtYXliZSBpbiB0aGUgbWFzdGVyLgorICAgICAgICAgICAgICAgICAgICBvbGRfdGlwID0gYi51
> cGRhdGUoKQorICAgICAgICAgICAgICAgICAgICByZXYgPSByZXZpc2lvblswXS5pbl9oaXN0b3J5
> KGIpLnJldl9pZAorICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICBvbGRfdGlwID0g
> Yi51cGRhdGUoKQorICAgICAgICAgICAgICAgIHJldiA9IGIubGFzdF9yZXZpc2lvbigpCisgICAg
> ICAgICAgICBpZiB0cmVlLmxhc3RfcmV2aXNpb24oKSA9PSByZXY6CisgICAgICAgICAgICAgICAg
> cmV2bm8gPSBiLnJldmlzaW9uX2lkX3RvX3Jldm5vKHJldikKKyAgICAgICAgICAgICAgICBub3Rl
> KCJUcmVlIGlzIHVwIHRvIGRhdGUgYXQgcmV2aXNpb24gJWQuIiAlIChyZXZubywpKQorICAgICAg
> ICAgICAgICAgIHJldHVybiAwCisgICAgICAgICAgICB0cnk6CisgICAgICAgICAgICAgICAgY29u
> ZmxpY3RzID0gdHJlZS51cGRhdGUocmV2LG9sZF90aXApCisgICAgICAgICAgICBleGNlcHQgZXJy
> b3JzLk5vU3VjaFJldmlzaW9uLCBlOgorICAgICAgICAgICAgICAgIHJhaXNlIEJ6ckNvbW1hbmRF
> cnJvcigiYnJhbmNoIGhhcyBubyByZXZpc2lvbiAlc1xuIgorICAgICAgICAgICAgICAgICAgICAg
> ICAgICAgICAgICAgICAgICAiYnpyIHVwZGF0ZSAtLXJldmlzaW9uIHdvcmtzIG9ubHkgZm9yIGEg
> cmV2aXNpb24gaW4gdGhlIGJyYW5jaCBoaXN0b3J5IgorICAgICAgICAgICAgICAgICAgICAgICAg
> ICAgICAgICAgICAgICAlIChlLnJldmlzaW9uKSkKKyAgICAgICAgICAgIHJldm5vID0gYi5yZXZp
> c2lvbl9pZF90b19yZXZubyh0cmVlLmxhc3RfcmV2aXNpb24oKSkKICAgICAgICAgICAgIG5vdGUo
> J1VwZGF0ZWQgdG8gcmV2aXNpb24gJWQuJyAlIChyZXZubywpKQogICAgICAgICAgICAgaWYgdHJl
> ZS5wZW5kaW5nX21lcmdlcygpICE9IGV4aXN0aW5nX3BlbmRpbmdfbWVyZ2VzOgogICAgICAgICAg
> ICAgICAgIG5vdGUoJ1lvdXIgbG9jYWwgY29tbWl0cyB3aWxsIG5vdyBzaG93IGFzIHBlbmRpbmcg
> bWVyZ2VzIHdpdGggJwoK
>
> === modified file bzrlib/tests/blackbox/test_update.py //
last-changed:Matthieu
> ... .Moy at imag.fr-20060804162343-5dc628faf643da23 // encoding:base64
> LS0tIGJ6cmxpYi90ZXN0cy9ibGFja2JveC90ZXN0X3VwZGF0ZS5weQorKysgYnpybGliL3Rlc3Rz
> L2JsYWNrYm94L3Rlc3RfdXBkYXRlLnB5CkBAIC0xOTQsMyArMTk0LDczIEBACiAKICAgICAgICAg
> IyBUaGUgcGVuZGluZyBtZXJnZXMgc2hvdWxkIHN0aWxsIGJlIHRoZXJlCiAgICAgICAgIHNlbGYu
> YXNzZXJ0RXF1YWwoWydvMiddLCBjaGVja291dDEucGVuZGluZ19tZXJnZXMoKSkKKworICAgIGRl
> ZiB0ZXN0X3VwZGF0ZV9kYXNoX3Ioc2VsZik6CisgICAgICAgICMgVGVzdCB0aGF0ICdienIgdXBk
> YXRlJyB3b3JrcyBjb3JyZWN0bHkgd2hlbiB5b3UgaGF2ZQorICAgICAgICAjIGFuIHVwZGF0ZSBp
> biB0aGUgbWFzdGVyIHRyZWUsIGFuZCBhIGxpZ2h0d2VpZ2h0IGNoZWNrb3V0CisgICAgICAgICMg
> d2hpY2ggaGFzIG1lcmdlZCBhbm90aGVyIGJyYW5jaAorICAgICAgICBtYXN0ZXIgPSBzZWxmLm1h
> a2VfYnJhbmNoX2FuZF90cmVlKCdtYXN0ZXInKQorICAgICAgICBvcy5jaGRpcignbWFzdGVyJykK
> KyAgICAgICAgc2VsZi5idWlsZF90cmVlKFsnLi9maWxlMSddKQorICAgICAgICBtYXN0ZXIuYWRk
> KFsnZmlsZTEnXSkKKyAgICAgICAgbWFzdGVyLmNvbW1pdCgnb25lJywgcmV2X2lkPSdtMScpCisg
> ICAgICAgIHNlbGYuYnVpbGRfdHJlZShbJy4vZmlsZTInXSkKKyAgICAgICAgbWFzdGVyLmFkZChb
> J2ZpbGUyJ10pCisgICAgICAgIG1hc3Rlci5jb21taXQoJ3R3bycsIHJldl9pZD0nbTInKQorICAg
> ICAgICAKKyAgICAgICAgb3V0LCBlcnIgPSBzZWxmLnJ1bl9ienIoJ3VwZGF0ZScsICctcicsICcx
> JykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnJywgb3V0KQorICAgICAgICBzZWxmLmFzc2Vy
> dEVxdWFsKCdBbGwgY2hhbmdlcyBhcHBsaWVkIHN1Y2Nlc3NmdWxseS5cbicKKyAgICAgICAgICAg
> ICAgICAgICAgICAgICAnVXBkYXRlZCB0byByZXZpc2lvbiAxLlxuJywgZXJyKQorICAgICAgICBz
> ZWxmLmZhaWxVbmxlc3NFeGlzdHMoJy4vZmlsZTEnKQorICAgICAgICBzZWxmLmZhaWxJZkV4aXN0
> cygnLi9maWxlMicpCisgICAgICAgIHNlbGYuY2hlY2tfZmlsZV9jb250ZW50cygnLmJ6ci9jaGVj
> a291dC9sYXN0LXJldmlzaW9uJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdt
> MScpCisKKyAgICBkZWYgdGVzdF91cGRhdGVfZGFzaF9yX291dHNpZGVfaGlzdG9yeShzZWxmKToK
> KyAgICAgICAgIyBUZXN0IHRoYXQgJ2J6ciB1cGRhdGUnIHdvcmtzIGNvcnJlY3RseSB3aGVuIHlv
> dSBoYXZlCisgICAgICAgICMgYW4gdXBkYXRlIGluIHRoZSBtYXN0ZXIgdHJlZSwgYW5kIGEgbGln
> aHR3ZWlnaHQgY2hlY2tvdXQKKyAgICAgICAgIyB3aGljaCBoYXMgbWVyZ2VkIGFub3RoZXIgYnJh
> bmNoCisgICAgICAgIG1hc3RlciA9IHNlbGYubWFrZV9icmFuY2hfYW5kX3RyZWUoJ21hc3Rlcicp
> CisgICAgICAgIHNlbGYuYnVpbGRfdHJlZShbJ21hc3Rlci9maWxlMSddKQorICAgICAgICBtYXN0
> ZXIuYWRkKFsnZmlsZTEnXSkKKyAgICAgICAgbWFzdGVyLmNvbW1pdCgnb25lJywgcmV2X2lkPSdt
> MScpCisKKyAgICAgICAgIyBDcmVhdGUgYSBzZWNvbmQgYnJhbmNoLCB3aXRoIGFuIGV4dHJhIGNv
> bW1pdAorICAgICAgICBvdGhlciA9IG1hc3Rlci5ienJkaXIuc3Byb3V0KCdvdGhlcicpLm9wZW5f
> d29ya2luZ3RyZWUoKQorICAgICAgICBzZWxmLmJ1aWxkX3RyZWUoWydvdGhlci9maWxlMiddKQor
> ICAgICAgICBvdGhlci5hZGQoWydmaWxlMiddKQorICAgICAgICBvdGhlci5jb21taXQoJ290aGVy
> MicsIHJldl9pZD0nbzInKQorCisgICAgICAgIG9zLmNoZGlyKCdtYXN0ZXInKQorICAgICAgICBz
> ZWxmLnJ1bl9ienIoJ21lcmdlJywgJy4uL290aGVyJykKKyAgICAgICAgbWFzdGVyLmNvbW1pdCgn
> bWVyZ2UnLCByZXZfaWQ9J21lcmdlJykKKworICAgICAgICBvdXQsIGVyciA9IHNlbGYucnVuX2J6
> cigndXBkYXRlJywgJy1yJywgJ3JldmlkOm8yJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAg
> ICAgICAgcmV0Y29kZT0zKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCcnLCBvdXQpCisgICAg
> ICAgIHNlbGYuYXNzZXJ0RXF1YWwoJ2J6cjogRVJST1I6IGJyYW5jaCBoYXMgbm8gcmV2aXNpb24g
> bzJcbicKKyAgICAgICAgICAgICAgICAgICAgICAgICAnYnpyIHVwZGF0ZSAtLXJldmlzaW9uIHdv
> cmtzIG9ubHknCisgICAgICAgICAgICAgICAgICAgICAgICAgJyBmb3IgYSByZXZpc2lvbiBpbiB0
> aGUgYnJhbmNoIGhpc3RvcnlcbicsCisgICAgICAgICAgICAgICAgICAgICAgICAgZXJyKQorCisg
> ICAgZGVmIHRlc3RfdXBkYXRlX2Rhc2hfcl9pbl9tYXN0ZXIoc2VsZik6CisgICAgICAgICMgVGVz
> dCB0aGF0ICdienIgdXBkYXRlJyB3b3JrcyBjb3JyZWN0bHkgd2hlbiB5b3UgaGF2ZQorICAgICAg
> ICAjIGFuIHVwZGF0ZSBpbiB0aGUgbWFzdGVyIHRyZWUsCisgICAgICAgIG1hc3RlciA9IHNlbGYu
> bWFrZV9icmFuY2hfYW5kX3RyZWUoJ21hc3RlcicpCisgICAgICAgIHNlbGYuYnVpbGRfdHJlZShb
> J21hc3Rlci9maWxlMSddKQorICAgICAgICBtYXN0ZXIuYWRkKFsnZmlsZTEnXSkKKyAgICAgICAg
> bWFzdGVyLmNvbW1pdCgnb25lJywgcmV2X2lkPSdtMScpCisKKyAgICAgICAgc2VsZi5ydW5fYnpy
> KCdjaGVja291dCcsICdtYXN0ZXInLCAnY2hlY2tvdXQnKQorCisgICAgICAgICMgYWRkIGEgcmV2
> aXNpb24gaW4gdGhlIG1hc3Rlci4KKyAgICAgICAgc2VsZi5idWlsZF90cmVlKFsnbWFzdGVyL2Zp
> bGUyJ10pCisgICAgICAgIG1hc3Rlci5hZGQoWydmaWxlMiddKQorICAgICAgICBtYXN0ZXIuY29t
> bWl0KCd0d28nLCByZXZfaWQ9J20yJykKKworICAgICAgICBvcy5jaGRpcignY2hlY2tvdXQnKQor
> ICAgICAgICBvdXQsIGVyciA9IHNlbGYucnVuX2J6cigndXBkYXRlJywgJy1yJywgJ3JldmlkOm0y
> JykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnJywgb3V0KQorICAgICAgICBzZWxmLmFzc2Vy
> dEVxdWFsKCdBbGwgY2hhbmdlcyBhcHBsaWVkIHN1Y2Nlc3NmdWxseS5cbicKKyAgICAgICAgICAg
> ICAgICAgICAgICAgICAnVXBkYXRlZCB0byByZXZpc2lvbiAyLlxuJywgZXJyKQoK
>
> === modified file bzrlib/workingtree.py // encoding:base64
> LS0tIGJ6cmxpYi93b3JraW5ndHJlZS5weQorKysgYnpybGliL3dvcmtpbmd0cmVlLnB5CkBAIC0x
> MzgzLDcgKzEzODMsNyBAQAogICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yKHNlbGYu
> dW5sb2NrKQogCiAgICAgQG5lZWRzX3dyaXRlX2xvY2sKLSAgICBkZWYgdXBkYXRlKHNlbGYpOgor
> ICAgIGRlZiB1cGRhdGUoc2VsZixyZXZpc2lvbj1Ob25lLG9sZF90aXA9MCk6CiAgICAgICAgICIi
> IlVwZGF0ZSBhIHdvcmtpbmcgdHJlZSBhbG9uZyBpdHMgYnJhbmNoLgogCiAgICAgICAgIFRoaXMg
> d2lsbCB1cGRhdGUgdGhlIGJyYW5jaCBpZiBpdHMgYm91bmQgdG9vLCB3aGljaCBtZWFucyB3ZSBo
> YXZlIG11bHRpcGxlIHRyZWVzIGludm9sdmVkOgpAQCAtMTQwMSwyMiArMTQwMSwzMiBAQAogICAg
> ICAgICBUaGVyZSBpc24ndCBhIHNpbmdsZSBvcGVyYXRpb24gYXQgdGhlIG1vbWVudCB0byBkbyB0
> aGF0LCBzbyB3ZToKICAgICAgICAgTWVyZ2UgY3VycmVudCBzdGF0ZSAtPiBiYXNpcyB0cmVlIG9m
> IHRoZSBtYXN0ZXIgdy5yLnQuIHRoZSBvbGQgdHJlZSBiYXNpcy4KICAgICAgICAgRG8gYSAnbm9y
> bWFsJyBtZXJnZSBvZiB0aGUgb2xkIGJyYW5jaCBiYXNpcyBpZiBpdCBpcyByZWxldmFudC4KKwor
> ICAgICAgICA6cGFyYW0gcmV2aXNpb246IFRoZSB0YXJnZXQgcmV2aXNpb24gdG8gdXBkYXRlIHRv
> LiBNdXN0IGJlIGluIHRoZSByZXZpc2lvbiBoaXN0b3J5LgorICAgICAgICA6cGFyYW0gb2xkX3Rp
> cDogSWYgYnJhbmNoLnVwZGF0ZSgpIGhhcyBhbHJlYWR5IGJlZW4gcnVuLCB0aGUgdmFsdWUgaXQg
> cmV0dXJuZWQgCisgICAgICAgIChvbGQgdGlwIG9mIHRoZSBicmFuY2ggb3IgbmlsKS4gT3RoZXJ3
> aXNlLCB0aGUgbnVtYmVyIDAuCiAgICAgICAgICIiIgotICAgICAgICBvbGRfdGlwID0gc2VsZi5i
> cmFuY2gudXBkYXRlKCkKKyAgICAgICAgaWYgb2xkX3RpcCA9PSAwOgorICAgICAgICAgICAgb2xk
> X3RpcCA9IHNlbGYuYnJhbmNoLnVwZGF0ZSgpCiAgICAgICAgIGlmIG9sZF90aXAgaXMgbm90IE5v
> bmU6CiAgICAgICAgICAgICBzZWxmLmFkZF9wZW5kaW5nX21lcmdlKG9sZF90aXApCiAgICAgICAg
> IHNlbGYuYnJhbmNoLmxvY2tfcmVhZCgpCiAgICAgICAgIHRyeToKKyAgICAgICAgICAgIGlmIHJl
> dmlzaW9uIGlzIE5vbmU6CisgICAgICAgICAgICAgICAgcmV2aXNpb24gPSBzZWxmLmJyYW5jaC5s
> YXN0X3JldmlzaW9uKCkKKyAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgaWYgcmV2
> aXNpb24gbm90IGluIHNlbGYuYnJhbmNoLnJldmlzaW9uX2hpc3RvcnkoKToKKyAgICAgICAgICAg
> ICAgICAgICAgcmFpc2UgZXJyb3JzLk5vU3VjaFJldmlzaW9uKHNlbGYuYnJhbmNoLCByZXZpc2lv
> bikKICAgICAgICAgICAgIHJlc3VsdCA9IDAKLSAgICAgICAgICAgIGlmIHNlbGYubGFzdF9yZXZp
> c2lvbigpICE9IHNlbGYuYnJhbmNoLmxhc3RfcmV2aXNpb24oKToKKyAgICAgICAgICAgIGlmIHNl
> bGYubGFzdF9yZXZpc2lvbigpICE9IHJldmlzaW9uOgogICAgICAgICAgICAgICAgICMgbWVyZ2Ug
> dHJlZSBzdGF0ZSB1cCB0byBuZXcgYnJhbmNoIHRpcC4KICAgICAgICAgICAgICAgICBiYXNpcyA9
> IHNlbGYuYmFzaXNfdHJlZSgpCi0gICAgICAgICAgICAgICAgdG9fdHJlZSA9IHNlbGYuYnJhbmNo
> LmJhc2lzX3RyZWUoKQorICAgICAgICAgICAgICAgIHRvX3RyZWUgPSBzZWxmLmJyYW5jaC5yZXBv
> c2l0b3J5LnJldmlzaW9uX3RyZWUocmV2aXNpb24pCiAgICAgICAgICAgICAgICAgcmVzdWx0ICs9
> IG1lcmdlX2lubmVyKHNlbGYuYnJhbmNoLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
> ICAgICAgICB0b190cmVlLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBi
> YXNpcywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGhpc190cmVlPXNl
> bGYpCi0gICAgICAgICAgICAgICAgc2VsZi5zZXRfbGFzdF9yZXZpc2lvbihzZWxmLmJyYW5jaC5s
> YXN0X3JldmlzaW9uKCkpCisgICAgICAgICAgICAgICAgc2VsZi5zZXRfbGFzdF9yZXZpc2lvbihy
> ZXZpc2lvbikKICAgICAgICAgICAgIGlmIG9sZF90aXAgYW5kIG9sZF90aXAgIT0gc2VsZi5sYXN0
> X3JldmlzaW9uKCk6CiAgICAgICAgICAgICAgICAgIyBvdXIgbGFzdCByZXZpc2lvbiB3YXMgbm90
> IHRoZSBwcmlvciBicmFuY2ggbGFzdCByZXZpc2lvbgogICAgICAgICAgICAgICAgICMgYW5kIHdl
> IGhhdmUgY29udmVydGVkIHRoYXQgbGFzdCByZXZpc2lvbiB0byBhIHBlbmRpbmcgbWVyZ2UuCkBA
> IC0xNDI0LDcgKzE0MzQsNyBAQAogICAgICAgICAgICAgICAgICMgYW5kIHRoZSBub3cgcGVuZGlu
> ZyBtZXJnZQogICAgICAgICAgICAgICAgIGZyb20gYnpybGliLnJldmlzaW9uIGltcG9ydCBjb21t
> b25fYW5jZXN0b3IKICAgICAgICAgICAgICAgICB0cnk6Ci0gICAgICAgICAgICAgICAgICAgIGJh
> c2VfcmV2X2lkID0gY29tbW9uX2FuY2VzdG9yKHNlbGYuYnJhbmNoLmxhc3RfcmV2aXNpb24oKSwK
> KyAgICAgICAgICAgICAgICAgICAgYmFzZV9yZXZfaWQgPSBjb21tb25fYW5jZXN0b3IocmV2aXNp
> b24sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9s
> ZF90aXAsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
> IHNlbGYuYnJhbmNoLnJlcG9zaXRvcnkpCiAgICAgICAgICAgICAgICAgZXhjZXB0IGVycm9ycy5O
> b0NvbW1vbkFuY2VzdG9yOgoK
>
> # revision id: Matthieu.Moy at imag.fr-20060828053533-d243b368e9306f39
> # sha1: 0150e0da1628bf5dd827109d7f65adf31c45f61e
> # inventory sha1: e03331347dde45291dde73bc457207643cce82d3
> # parent ids:
> # Matthieu.Moy at imag.fr-20060804164607-dc62a7e235f85cc1
> # pqm at pqm.ubuntu.com-20060828012417-06e65a27028c9476
> # properties:
> # branch-nick: bzr.update-r
>
> # message:
> # Don't run branch.update() when --revision is provided with a
revision in the local branch.
> #
> # committer: Matthieu Moy <Matthieu.Moy at imag.fr>
> # date: Fri 2006-08-04 22:16:07.966000080 +0530
>
> === modified file bzrlib/builtins.py // encoding:base64
> LS0tIGJ6cmxpYi9idWlsdGlucy5weQorKysgYnpybGliL2J1aWx0aW5zLnB5CkBAIC04MjMsMTcg
> KzgyMywyNCBAQAogICAgICAgICAgICAgIyBwb3RlbnRpYWxseSBnZXQgbmV3IHJldmlzaW9ucyBm
> cm9tIHRoZSBtYXN0ZXIgYnJhbmNoLgogICAgICAgICAgICAgIyBuZWVkZWQgZm9yIHRoZSBjYXNl
> IHdoZXJlIC1yIE4gaXMgZ2l2ZW4sIHdpdGggTiBub3QgeWV0CiAgICAgICAgICAgICAjIGluIHRo
> ZSBsb2NhbCBicmFuY2ggZm9yIGEgaGVhdnl3ZWlnaHQgY2hlY2tvdXQuCi0gICAgICAgICAgICBv
> bGRfdGlwID0gYi51cGRhdGUoKQogICAgICAgICAgICAgaWYgcmV2aXNpb24gaXMgbm90IE5vbmU6
> Ci0gICAgICAgICAgICAgICAgcmV2ID0gcmV2aXNpb25bMF0uaW5faGlzdG9yeShiKS5yZXZfaWQK
> KyAgICAgICAgICAgICAgICB0cnk6CisgICAgICAgICAgICAgICAgICAgIHJldiA9IHJldmlzaW9u
> WzBdLmluX2hpc3RvcnkoYikucmV2X2lkCisgICAgICAgICAgICAgICAgICAgICMgbm8gbmVlZCB0
> byBydW4gYnJhbmNoLnVwZGF0ZSgpCisgICAgICAgICAgICAgICAgICAgIG9sZF90aXA9Tm9uZQor
> ICAgICAgICAgICAgICAgIGV4Y2VwdCBlcnJvcnMuTm9TdWNoUmV2aXNpb246CisgICAgICAgICAg
> ICAgICAgICAgICMgcmV2aXNpb24gd2FzIG5vdCB0aGVyZSwgYnV0IGlzIG1heWJlIGluIHRoZSBt
> YXN0ZXIuCisgICAgICAgICAgICAgICAgICAgIG9sZF90aXAgPSBiLnVwZGF0ZSgpCisgICAgICAg
> ICAgICAgICAgICAgIHJldiA9IHJldmlzaW9uWzBdLmluX2hpc3RvcnkoYikucmV2X2lkCiAgICAg
> ICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgIG9sZF90aXAgPSBiLnVwZGF0ZSgpCiAgICAg
> ICAgICAgICAgICAgcmV2ID0gYi5sYXN0X3JldmlzaW9uKCkKICAgICAgICAgICAgIGlmIHRyZWUu
> bGFzdF9yZXZpc2lvbigpID09IHJldjoKICAgICAgICAgICAgICAgICByZXZubyA9IGIucmV2aXNp
> b25faWRfdG9fcmV2bm8ocmV2KQogICAgICAgICAgICAgICAgIG5vdGUoIlRyZWUgaXMgdXAgdG8g
> ZGF0ZSBhdCByZXZpc2lvbiAlZC4iICUgKHJldm5vLCkpCiAgICAgICAgICAgICAgICAgcmV0dXJu
> IDAKICAgICAgICAgICAgIHRyeToKLSAgICAgICAgICAgICAgICBjb25mbGljdHMgPSB0cmVlLnVw
> ZGF0ZShyZXYsb2xkX3RpcCBvciAwKQorICAgICAgICAgICAgICAgIGNvbmZsaWN0cyA9IHRyZWUu
> dXBkYXRlKHJldixvbGRfdGlwKQogICAgICAgICAgICAgZXhjZXB0IGVycm9ycy5Ob1N1Y2hSZXZp
> c2lvbiwgZToKICAgICAgICAgICAgICAgICByYWlzZSBCenJDb21tYW5kRXJyb3IoImJyYW5jaCBo
> YXMgbm8gcmV2aXNpb24gJXNcbiIKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
> ICAgImJ6ciB1cGRhdGUgLS1yZXZpc2lvbiB3b3JrcyBvbmx5IGZvciBhIHJldmlzaW9uIGluIHRo
> ZSBicmFuY2ggaGlzdG9yeSIKCg==
>
> # revision id: Matthieu.Moy at imag.fr-20060804164607-dc62a7e235f85cc1
> # sha1: 24767f61d5d9bc036cfe1c64e4058356ba0236a1
> # inventory sha1: 83b6feb5894c83ef8bcaa8f9fccc3c58c5f07717
> # parent ids:
> # Matthieu.Moy at imag.fr-20060804162343-5dc628faf643da23
> # properties:
> # branch-nick: bzr.moy
>
> # message:
> # Added test-cases for update -r. Tweaked the implementation too.
> #
> # * builtins.py: don't check the master branch since we just ran
> # branch.update()
> #
> # * Moved the error for revision out of branch history in workingtree.py.
> #
> # * Document new arguments in workingtree.update()
> #
> # committer: Matthieu Moy <Matthieu.Moy at imag.fr>
> # date: Fri 2006-08-04 21:53:43.104000092 +0530
>
> === modified file bzrlib/builtins.py // encoding:base64
> LS0tIGJ6cmxpYi9idWlsdGlucy5weQorKysgYnpybGliL2J1aWx0aW5zLnB5CkBAIC04MjAsMjYg
> KzgyMCwyNiBAQAogICAgICAgICB0cmVlLmxvY2tfd3JpdGUoKQogICAgICAgICBleGlzdGluZ19w
> ZW5kaW5nX21lcmdlcyA9IHRyZWUucGVuZGluZ19tZXJnZXMoKQogICAgICAgICB0cnk6CisgICAg
> ICAgICAgICAjIHBvdGVudGlhbGx5IGdldCBuZXcgcmV2aXNpb25zIGZyb20gdGhlIG1hc3RlciBi
> cmFuY2guCisgICAgICAgICAgICAjIG5lZWRlZCBmb3IgdGhlIGNhc2Ugd2hlcmUgLXIgTiBpcyBn
> aXZlbiwgd2l0aCBOIG5vdCB5ZXQKKyAgICAgICAgICAgICMgaW4gdGhlIGxvY2FsIGJyYW5jaCBm
> b3IgYSBoZWF2eXdlaWdodCBjaGVja291dC4KICAgICAgICAgICAgIG9sZF90aXAgPSBiLnVwZGF0
> ZSgpCiAgICAgICAgICAgICBpZiByZXZpc2lvbiBpcyBub3QgTm9uZToKICAgICAgICAgICAgICAg
> ICByZXYgPSByZXZpc2lvblswXS5pbl9oaXN0b3J5KGIpLnJldl9pZAotICAgICAgICAgICAgICAg
> IGlmIHJldiBub3QgaW4gYi5yZXZpc2lvbl9oaXN0b3J5KCk6Ci0gICAgICAgICAgICAgICAgICAg
> IHJhaXNlIEJ6ckNvbW1hbmRFcnJvcigiYnpyIHVwZGF0ZSAtLXJldmlzaW9uIHdvcmtzIG9ubHkg
> Zm9yIGEgcmV2aXNpb24gaW4gdGhlIGJyYW5jaCBoaXN0b3J5IikKICAgICAgICAgICAgIGVsc2U6
> CiAgICAgICAgICAgICAgICAgcmV2ID0gYi5sYXN0X3JldmlzaW9uKCkKICAgICAgICAgICAgIGlm
> IHRyZWUubGFzdF9yZXZpc2lvbigpID09IHJldjoKLSAgICAgICAgICAgICAgICAjIG1heSBiZSB1
> cCB0byBkYXRlLCBjaGVjayBtYXN0ZXIgdG9vLgotICAgICAgICAgICAgICAgIG1hc3RlciA9IGIu
> Z2V0X21hc3Rlcl9icmFuY2goKQotICAgICAgICAgICAgICAgIGlmIG1hc3RlciBpcyBOb25lIG9y
> IHJldiA9PSBtYXN0ZXIubGFzdF9yZXZpc2lvbigpOgotICAgICAgICAgICAgICAgICAgICByZXZu
> byA9IGIucmV2aXNpb25faWRfdG9fcmV2bm8ocmV2KQotICAgICAgICAgICAgICAgICAgICBub3Rl
> KCJUcmVlIGlzIHVwIHRvIGRhdGUgYXQgcmV2aXNpb24gJWQuIiAlIChyZXZubywpKQotICAgICAg
> ICAgICAgICAgICAgICByZXR1cm4gMAotICAgICAgICAgICAgY29uZmxpY3RzID0gdHJlZS51cGRh
> dGUocmV2LG9sZF90aXAgb3IgIm5vdF9jb21wdXRlZCIpCisgICAgICAgICAgICAgICAgcmV2bm8g
> PSBiLnJldmlzaW9uX2lkX3RvX3Jldm5vKHJldikKKyAgICAgICAgICAgICAgICBub3RlKCJUcmVl
> IGlzIHVwIHRvIGRhdGUgYXQgcmV2aXNpb24gJWQuIiAlIChyZXZubywpKQorICAgICAgICAgICAg
> ICAgIHJldHVybiAwCiAgICAgICAgICAgICB0cnk6Ci0gICAgICAgICAgICAgICAgcmV2bm8gPSBz
> dHIoYi5yZXZpc2lvbl9pZF90b19yZXZubyh0cmVlLmxhc3RfcmV2aXNpb24oKSkpCi0gICAgICAg
> ICAgICBleGNlcHQgZXJyb3JzLk5vU3VjaFJldmlzaW9uOgotICAgICAgICAgICAgICAgIHJldm5v
> ID0gcmV2Ci0gICAgICAgICAgICBub3RlKCdVcGRhdGVkIHRvIHJldmlzaW9uICVzLicgJSAocmV2
> bm8sKSkKKyAgICAgICAgICAgICAgICBjb25mbGljdHMgPSB0cmVlLnVwZGF0ZShyZXYsb2xkX3Rp
> cCBvciAwKQorICAgICAgICAgICAgZXhjZXB0IGVycm9ycy5Ob1N1Y2hSZXZpc2lvbiwgZToKKyAg
> ICAgICAgICAgICAgICByYWlzZSBCenJDb21tYW5kRXJyb3IoImJyYW5jaCBoYXMgbm8gcmV2aXNp
> b24gJXNcbiIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgImJ6ciB1cGRh
> dGUgLS1yZXZpc2lvbiB3b3JrcyBvbmx5IGZvciBhIHJldmlzaW9uIGluIHRoZSBicmFuY2ggaGlz
> dG9yeSIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJSAoZS5yZXZpc2lv
> bikpCisgICAgICAgICAgICByZXZubyA9IGIucmV2aXNpb25faWRfdG9fcmV2bm8odHJlZS5sYXN0
> X3JldmlzaW9uKCkpCisgICAgICAgICAgICBub3RlKCdVcGRhdGVkIHRvIHJldmlzaW9uICVkLicg
> JSAocmV2bm8sKSkKICAgICAgICAgICAgIGlmIHRyZWUucGVuZGluZ19tZXJnZXMoKSAhPSBleGlz
> dGluZ19wZW5kaW5nX21lcmdlczoKICAgICAgICAgICAgICAgICBub3RlKCdZb3VyIGxvY2FsIGNv
> bW1pdHMgd2lsbCBub3cgc2hvdyBhcyBwZW5kaW5nIG1lcmdlcyB3aXRoICcKICAgICAgICAgICAg
> ICAgICAgICAgICInYnpyIHN0YXR1cycsIGFuZCBjYW4gYmUgY29tbWl0dGVkIHdpdGggJ2J6ciBj
> b21taXQnLiIpCgo=
>
> === modified file bzrlib/tests/blackbox/test_update.py // encoding:base64
> LS0tIGJ6cmxpYi90ZXN0cy9ibGFja2JveC90ZXN0X3VwZGF0ZS5weQorKysgYnpybGliL3Rlc3Rz
> L2JsYWNrYm94L3Rlc3RfdXBkYXRlLnB5CkBAIC0xOTQsMyArMTk0LDczIEBACiAKICAgICAgICAg
> IyBUaGUgcGVuZGluZyBtZXJnZXMgc2hvdWxkIHN0aWxsIGJlIHRoZXJlCiAgICAgICAgIHNlbGYu
> YXNzZXJ0RXF1YWwoWydvMiddLCBjaGVja291dDEucGVuZGluZ19tZXJnZXMoKSkKKworICAgIGRl
> ZiB0ZXN0X3VwZGF0ZV9kYXNoX3Ioc2VsZik6CisgICAgICAgICMgVGVzdCB0aGF0ICdienIgdXBk
> YXRlJyB3b3JrcyBjb3JyZWN0bHkgd2hlbiB5b3UgaGF2ZQorICAgICAgICAjIGFuIHVwZGF0ZSBp
> biB0aGUgbWFzdGVyIHRyZWUsIGFuZCBhIGxpZ2h0d2VpZ2h0IGNoZWNrb3V0CisgICAgICAgICMg
> d2hpY2ggaGFzIG1lcmdlZCBhbm90aGVyIGJyYW5jaAorICAgICAgICBtYXN0ZXIgPSBzZWxmLm1h
> a2VfYnJhbmNoX2FuZF90cmVlKCdtYXN0ZXInKQorICAgICAgICBvcy5jaGRpcignbWFzdGVyJykK
> KyAgICAgICAgc2VsZi5idWlsZF90cmVlKFsnLi9maWxlMSddKQorICAgICAgICBtYXN0ZXIuYWRk
> KFsnZmlsZTEnXSkKKyAgICAgICAgbWFzdGVyLmNvbW1pdCgnb25lJywgcmV2X2lkPSdtMScpCisg
> ICAgICAgIHNlbGYuYnVpbGRfdHJlZShbJy4vZmlsZTInXSkKKyAgICAgICAgbWFzdGVyLmFkZChb
> J2ZpbGUyJ10pCisgICAgICAgIG1hc3Rlci5jb21taXQoJ3R3bycsIHJldl9pZD0nbTInKQorICAg
> ICAgICAKKyAgICAgICAgb3V0LCBlcnIgPSBzZWxmLnJ1bl9ienIoJ3VwZGF0ZScsICctcicsICcx
> JykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnJywgb3V0KQorICAgICAgICBzZWxmLmFzc2Vy
> dEVxdWFsKCdBbGwgY2hhbmdlcyBhcHBsaWVkIHN1Y2Nlc3NmdWxseS5cbicKKyAgICAgICAgICAg
> ICAgICAgICAgICAgICAnVXBkYXRlZCB0byByZXZpc2lvbiAxLlxuJywgZXJyKQorICAgICAgICBz
> ZWxmLmZhaWxVbmxlc3NFeGlzdHMoJy4vZmlsZTEnKQorICAgICAgICBzZWxmLmZhaWxJZkV4aXN0
> cygnLi9maWxlMicpCisgICAgICAgIHNlbGYuY2hlY2tfZmlsZV9jb250ZW50cygnLmJ6ci9jaGVj
> a291dC9sYXN0LXJldmlzaW9uJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdt
> MScpCisKKyAgICBkZWYgdGVzdF91cGRhdGVfZGFzaF9yX291dHNpZGVfaGlzdG9yeShzZWxmKToK
> KyAgICAgICAgIyBUZXN0IHRoYXQgJ2J6ciB1cGRhdGUnIHdvcmtzIGNvcnJlY3RseSB3aGVuIHlv
> dSBoYXZlCisgICAgICAgICMgYW4gdXBkYXRlIGluIHRoZSBtYXN0ZXIgdHJlZSwgYW5kIGEgbGln
> aHR3ZWlnaHQgY2hlY2tvdXQKKyAgICAgICAgIyB3aGljaCBoYXMgbWVyZ2VkIGFub3RoZXIgYnJh
> bmNoCisgICAgICAgIG1hc3RlciA9IHNlbGYubWFrZV9icmFuY2hfYW5kX3RyZWUoJ21hc3Rlcicp
> CisgICAgICAgIHNlbGYuYnVpbGRfdHJlZShbJ21hc3Rlci9maWxlMSddKQorICAgICAgICBtYXN0
> ZXIuYWRkKFsnZmlsZTEnXSkKKyAgICAgICAgbWFzdGVyLmNvbW1pdCgnb25lJywgcmV2X2lkPSdt
> MScpCisKKyAgICAgICAgIyBDcmVhdGUgYSBzZWNvbmQgYnJhbmNoLCB3aXRoIGFuIGV4dHJhIGNv
> bW1pdAorICAgICAgICBvdGhlciA9IG1hc3Rlci5ienJkaXIuc3Byb3V0KCdvdGhlcicpLm9wZW5f
> d29ya2luZ3RyZWUoKQorICAgICAgICBzZWxmLmJ1aWxkX3RyZWUoWydvdGhlci9maWxlMiddKQor
> ICAgICAgICBvdGhlci5hZGQoWydmaWxlMiddKQorICAgICAgICBvdGhlci5jb21taXQoJ290aGVy
> MicsIHJldl9pZD0nbzInKQorCisgICAgICAgIG9zLmNoZGlyKCdtYXN0ZXInKQorICAgICAgICBz
> ZWxmLnJ1bl9ienIoJ21lcmdlJywgJy4uL290aGVyJykKKyAgICAgICAgbWFzdGVyLmNvbW1pdCgn
> bWVyZ2UnLCByZXZfaWQ9J21lcmdlJykKKworICAgICAgICBvdXQsIGVyciA9IHNlbGYucnVuX2J6
> cigndXBkYXRlJywgJy1yJywgJ3JldmlkOm8yJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAg
> ICAgICAgcmV0Y29kZT0zKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCcnLCBvdXQpCisgICAg
> ICAgIHNlbGYuYXNzZXJ0RXF1YWwoJ2J6cjogRVJST1I6IGJyYW5jaCBoYXMgbm8gcmV2aXNpb24g
> bzJcbicKKyAgICAgICAgICAgICAgICAgICAgICAgICAnYnpyIHVwZGF0ZSAtLXJldmlzaW9uIHdv
> cmtzIG9ubHknCisgICAgICAgICAgICAgICAgICAgICAgICAgJyBmb3IgYSByZXZpc2lvbiBpbiB0
> aGUgYnJhbmNoIGhpc3RvcnlcbicsCisgICAgICAgICAgICAgICAgICAgICAgICAgZXJyKQorCisg
> ICAgZGVmIHRlc3RfdXBkYXRlX2Rhc2hfcl9pbl9tYXN0ZXIoc2VsZik6CisgICAgICAgICMgVGVz
> dCB0aGF0ICdienIgdXBkYXRlJyB3b3JrcyBjb3JyZWN0bHkgd2hlbiB5b3UgaGF2ZQorICAgICAg
> ICAjIGFuIHVwZGF0ZSBpbiB0aGUgbWFzdGVyIHRyZWUsCisgICAgICAgIG1hc3RlciA9IHNlbGYu
> bWFrZV9icmFuY2hfYW5kX3RyZWUoJ21hc3RlcicpCisgICAgICAgIHNlbGYuYnVpbGRfdHJlZShb
> J21hc3Rlci9maWxlMSddKQorICAgICAgICBtYXN0ZXIuYWRkKFsnZmlsZTEnXSkKKyAgICAgICAg
> bWFzdGVyLmNvbW1pdCgnb25lJywgcmV2X2lkPSdtMScpCisKKyAgICAgICAgc2VsZi5ydW5fYnpy
> KCdjaGVja291dCcsICdtYXN0ZXInLCAnY2hlY2tvdXQnKQorCisgICAgICAgICMgYWRkIGEgcmV2
> aXNpb24gaW4gdGhlIG1hc3Rlci4KKyAgICAgICAgc2VsZi5idWlsZF90cmVlKFsnbWFzdGVyL2Zp
> bGUyJ10pCisgICAgICAgIG1hc3Rlci5hZGQoWydmaWxlMiddKQorICAgICAgICBtYXN0ZXIuY29t
> bWl0KCd0d28nLCByZXZfaWQ9J20yJykKKworICAgICAgICBvcy5jaGRpcignY2hlY2tvdXQnKQor
> ICAgICAgICBvdXQsIGVyciA9IHNlbGYucnVuX2J6cigndXBkYXRlJywgJy1yJywgJ3JldmlkOm0y
> JykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnJywgb3V0KQorICAgICAgICBzZWxmLmFzc2Vy
> dEVxdWFsKCdBbGwgY2hhbmdlcyBhcHBsaWVkIHN1Y2Nlc3NmdWxseS5cbicKKyAgICAgICAgICAg
> ICAgICAgICAgICAgICAnVXBkYXRlZCB0byByZXZpc2lvbiAyLlxuJywgZXJyKQoK
>
> === modified file bzrlib/workingtree.py // encoding:base64
> LS0tIGJ6cmxpYi93b3JraW5ndHJlZS5weQorKysgYnpybGliL3dvcmtpbmd0cmVlLnB5CkBAIC0x
> MzgzLDcgKzEzODMsNyBAQAogICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yKHNlbGYu
> dW5sb2NrKQogCiAgICAgQG5lZWRzX3dyaXRlX2xvY2sKLSAgICBkZWYgdXBkYXRlKHNlbGYscmV2
> aXNpb249Tm9uZSxvbGRfdGlwPSJub3RfY29tcHV0ZWQiKToKKyAgICBkZWYgdXBkYXRlKHNlbGYs
> cmV2aXNpb249Tm9uZSxvbGRfdGlwPTApOgogICAgICAgICAiIiJVcGRhdGUgYSB3b3JraW5nIHRy
> ZWUgYWxvbmcgaXRzIGJyYW5jaC4KIAogICAgICAgICBUaGlzIHdpbGwgdXBkYXRlIHRoZSBicmFu
> Y2ggaWYgaXRzIGJvdW5kIHRvbywgd2hpY2ggbWVhbnMgd2UgaGF2ZSBtdWx0aXBsZSB0cmVlcyBp
> bnZvbHZlZDoKQEAgLTE0MDEsOCArMTQwMSwxMiBAQAogICAgICAgICBUaGVyZSBpc24ndCBhIHNp
> bmdsZSBvcGVyYXRpb24gYXQgdGhlIG1vbWVudCB0byBkbyB0aGF0LCBzbyB3ZToKICAgICAgICAg
> TWVyZ2UgY3VycmVudCBzdGF0ZSAtPiBiYXNpcyB0cmVlIG9mIHRoZSBtYXN0ZXIgdy5yLnQuIHRo
> ZSBvbGQgdHJlZSBiYXNpcy4KICAgICAgICAgRG8gYSAnbm9ybWFsJyBtZXJnZSBvZiB0aGUgb2xk
> IGJyYW5jaCBiYXNpcyBpZiBpdCBpcyByZWxldmFudC4KKworICAgICAgICA6cGFyYW0gcmV2aXNp
> b246IFRoZSB0YXJnZXQgcmV2aXNpb24gdG8gdXBkYXRlIHRvLiBNdXN0IGJlIGluIHRoZSByZXZp
> c2lvbiBoaXN0b3J5LgorICAgICAgICA6cGFyYW0gb2xkX3RpcDogSWYgYnJhbmNoLnVwZGF0ZSgp
> IGhhcyBhbHJlYWR5IGJlZW4gcnVuLCB0aGUgdmFsdWUgaXQgcmV0dXJuZWQgCisgICAgICAgIChv
> bGQgdGlwIG9mIHRoZSBicmFuY2ggb3IgbmlsKS4gT3RoZXJ3aXNlLCB0aGUgbnVtYmVyIDAuCiAg
> ICAgICAgICIiIgotICAgICAgICBpZiBvbGRfdGlwID09ICJub3RfY29tcHV0ZWQiOgorICAgICAg
> ICBpZiBvbGRfdGlwID09IDA6CiAgICAgICAgICAgICBvbGRfdGlwID0gc2VsZi5icmFuY2gudXBk
> YXRlKCkKICAgICAgICAgaWYgb2xkX3RpcCBpcyBub3QgTm9uZToKICAgICAgICAgICAgIHNlbGYu
> YWRkX3BlbmRpbmdfbWVyZ2Uob2xkX3RpcCkKQEAgLTE0MTAsNiArMTQxNCw5IEBACiAgICAgICAg
> IHRyeToKICAgICAgICAgICAgIGlmIHJldmlzaW9uIGlzIE5vbmU6CiAgICAgICAgICAgICAgICAg
> cmV2aXNpb24gPSBzZWxmLmJyYW5jaC5sYXN0X3JldmlzaW9uKCkKKyAgICAgICAgICAgIGVsc2U6
> CisgICAgICAgICAgICAgICAgaWYgcmV2aXNpb24gbm90IGluIHNlbGYuYnJhbmNoLnJldmlzaW9u
> X2hpc3RvcnkoKToKKyAgICAgICAgICAgICAgICAgICAgcmFpc2UgZXJyb3JzLk5vU3VjaFJldmlz
> aW9uKHNlbGYuYnJhbmNoLCByZXZpc2lvbikKICAgICAgICAgICAgIHJlc3VsdCA9IDAKICAgICAg
> ICAgICAgIGlmIHNlbGYubGFzdF9yZXZpc2lvbigpICE9IHJldmlzaW9uOgogICAgICAgICAgICAg
> ICAgICMgbWVyZ2UgdHJlZSBzdGF0ZSB1cCB0byBuZXcgYnJhbmNoIHRpcC4KCg==
>
> # revision id: Matthieu.Moy at imag.fr-20060804162343-5dc628faf643da23
> # sha1: d85c9470dbeaf4de49c73bb9e60441359713fad1
> # inventory sha1: 01b35bbc3ae871dfe40c64b3ea8131152cdaf533
> # parent ids:
> # Matthieu.Moy at imag.fr-20060802121047-7cd8452059a75e8a
> # properties:
> # branch-nick: bzr.moy
>
> # message:
> # variable renaming (last_rev -> rev) + test if the revision is in
branch history.
> #
> # committer: Matthieu Moy <Matthieu.Moy at imag.fr>
> # date: Wed 2006-08-02 17:40:47.069000006 +0530
>
> === modified file bzrlib/builtins.py // encoding:base64
> LS0tIGJ6cmxpYi9idWlsdGlucy5weQorKysgYnpybGliL2J1aWx0aW5zLnB5CkBAIC04MjIsMjEg
> KzgyMiwyMyBAQAogICAgICAgICB0cnk6CiAgICAgICAgICAgICBvbGRfdGlwID0gYi51cGRhdGUo
> KQogICAgICAgICAgICAgaWYgcmV2aXNpb24gaXMgbm90IE5vbmU6Ci0gICAgICAgICAgICAgICAg
> bGFzdF9yZXYgPSByZXZpc2lvblswXS5pbl9oaXN0b3J5KGIpLnJldl9pZAorICAgICAgICAgICAg
> ICAgIHJldiA9IHJldmlzaW9uWzBdLmluX2hpc3RvcnkoYikucmV2X2lkCisgICAgICAgICAgICAg
> ICAgaWYgcmV2IG5vdCBpbiBiLnJldmlzaW9uX2hpc3RvcnkoKToKKyAgICAgICAgICAgICAgICAg
> ICAgcmFpc2UgQnpyQ29tbWFuZEVycm9yKCJienIgdXBkYXRlIC0tcmV2aXNpb24gd29ya3Mgb25s
> eSBmb3IgYSByZXZpc2lvbiBpbiB0aGUgYnJhbmNoIGhpc3RvcnkiKQogICAgICAgICAgICAgZWxz
> ZToKLSAgICAgICAgICAgICAgICBsYXN0X3JldiA9IGIubGFzdF9yZXZpc2lvbigpCi0gICAgICAg
> ICAgICBpZiB0cmVlLmxhc3RfcmV2aXNpb24oKSA9PSBsYXN0X3JldjoKKyAgICAgICAgICAgICAg
> ICByZXYgPSBiLmxhc3RfcmV2aXNpb24oKQorICAgICAgICAgICAgaWYgdHJlZS5sYXN0X3Jldmlz
> aW9uKCkgPT0gcmV2OgogICAgICAgICAgICAgICAgICMgbWF5IGJlIHVwIHRvIGRhdGUsIGNoZWNr
> IG1hc3RlciB0b28uCiAgICAgICAgICAgICAgICAgbWFzdGVyID0gYi5nZXRfbWFzdGVyX2JyYW5j
> aCgpCi0gICAgICAgICAgICAgICAgaWYgbWFzdGVyIGlzIE5vbmUgb3IgbGFzdF9yZXYgPT0gbWFz
> dGVyLmxhc3RfcmV2aXNpb24oKToKLSAgICAgICAgICAgICAgICAgICAgcmV2bm8gPSBiLnJldmlz
> aW9uX2lkX3RvX3Jldm5vKGxhc3RfcmV2KQorICAgICAgICAgICAgICAgIGlmIG1hc3RlciBpcyBO
> b25lIG9yIHJldiA9PSBtYXN0ZXIubGFzdF9yZXZpc2lvbigpOgorICAgICAgICAgICAgICAgICAg
> ICByZXZubyA9IGIucmV2aXNpb25faWRfdG9fcmV2bm8ocmV2KQogICAgICAgICAgICAgICAgICAg
> ICBub3RlKCJUcmVlIGlzIHVwIHRvIGRhdGUgYXQgcmV2aXNpb24gJWQuIiAlIChyZXZubywpKQog
> ICAgICAgICAgICAgICAgICAgICByZXR1cm4gMAotICAgICAgICAgICAgY29uZmxpY3RzID0gdHJl
> ZS51cGRhdGUobGFzdF9yZXYsb2xkX3RpcCBvciAibm90X2NvbXB1dGVkIikKKyAgICAgICAgICAg
> IGNvbmZsaWN0cyA9IHRyZWUudXBkYXRlKHJldixvbGRfdGlwIG9yICJub3RfY29tcHV0ZWQiKQog
> ICAgICAgICAgICAgdHJ5OgogICAgICAgICAgICAgICAgIHJldm5vID0gc3RyKGIucmV2aXNpb25f
> aWRfdG9fcmV2bm8odHJlZS5sYXN0X3JldmlzaW9uKCkpKQogICAgICAgICAgICAgZXhjZXB0IGVy
> cm9ycy5Ob1N1Y2hSZXZpc2lvbjoKLSAgICAgICAgICAgICAgICByZXZubyA9IGxhc3RfcmV2Cisg
> ICAgICAgICAgICAgICAgcmV2bm8gPSByZXYKICAgICAgICAgICAgIG5vdGUoJ1VwZGF0ZWQgdG8g
> cmV2aXNpb24gJXMuJyAlIChyZXZubywpKQogICAgICAgICAgICAgaWYgdHJlZS5wZW5kaW5nX21l
> cmdlcygpICE9IGV4aXN0aW5nX3BlbmRpbmdfbWVyZ2VzOgogICAgICAgICAgICAgICAgIG5vdGUo
> J1lvdXIgbG9jYWwgY29tbWl0cyB3aWxsIG5vdyBzaG93IGFzIHBlbmRpbmcgbWVyZ2VzIHdpdGgg
> JwoK
>
> # revision id: Matthieu.Moy at imag.fr-20060802121047-7cd8452059a75e8a
> # sha1: 4b32158db83b68c85f47a52b82c21154669f5d91
> # inventory sha1: 5d1e9595755cdd147567b6921609a035ca4afc84
> # parent ids:
> # Matthieu.Moy at imag.fr-20060802114722-df1fc09ca6d1a6d5
> # properties:
> # branch-nick: bzr.moy
>
> # message:
> # run branch.update in cmd_update, it's needed.
> #
> # committer: Matthieu Moy <Matthieu.Moy at imag.fr>
> # date: Wed 2006-08-02 17:17:22.496999979 +0530
>
> === modified file bzrlib/builtins.py // encoding:base64
> LS0tIGJ6cmxpYi9idWlsdGlucy5weQorKysgYnpybGliL2J1aWx0aW5zLnB5CkBAIC04MjAsNiAr
> ODIwLDcgQEAKICAgICAgICAgdHJlZS5sb2NrX3dyaXRlKCkKICAgICAgICAgZXhpc3RpbmdfcGVu
> ZGluZ19tZXJnZXMgPSB0cmVlLnBlbmRpbmdfbWVyZ2VzKCkKICAgICAgICAgdHJ5OgorICAgICAg
> ICAgICAgb2xkX3RpcCA9IGIudXBkYXRlKCkKICAgICAgICAgICAgIGlmIHJldmlzaW9uIGlzIG5v
> dCBOb25lOgogICAgICAgICAgICAgICAgIGxhc3RfcmV2ID0gcmV2aXNpb25bMF0uaW5faGlzdG9y
> eShiKS5yZXZfaWQKICAgICAgICAgICAgIGVsc2U6CkBAIC04MzEsOSArODMyLDkgQEAKICAgICAg
> ICAgICAgICAgICAgICAgcmV2bm8gPSBiLnJldmlzaW9uX2lkX3RvX3Jldm5vKGxhc3RfcmV2KQog
> ICAgICAgICAgICAgICAgICAgICBub3RlKCJUcmVlIGlzIHVwIHRvIGRhdGUgYXQgcmV2aXNpb24g
> JWQuIiAlIChyZXZubywpKQogICAgICAgICAgICAgICAgICAgICByZXR1cm4gMAotICAgICAgICAg
> ICAgY29uZmxpY3RzID0gdHJlZS51cGRhdGUobGFzdF9yZXYpCisgICAgICAgICAgICBjb25mbGlj
> dHMgPSB0cmVlLnVwZGF0ZShsYXN0X3JldixvbGRfdGlwIG9yICJub3RfY29tcHV0ZWQiKQogICAg
> ICAgICAgICAgdHJ5OgotICAgICAgICAgICAgICAgIHJldm5vID0gc3RyKGIucmV2aXNpb25faWRf
> dG9fcmV2bm8obGFzdF9yZXYpKQorICAgICAgICAgICAgICAgIHJldm5vID0gc3RyKGIucmV2aXNp
> b25faWRfdG9fcmV2bm8odHJlZS5sYXN0X3JldmlzaW9uKCkpKQogICAgICAgICAgICAgZXhjZXB0
> IGVycm9ycy5Ob1N1Y2hSZXZpc2lvbjoKICAgICAgICAgICAgICAgICByZXZubyA9IGxhc3RfcmV2
> CiAgICAgICAgICAgICBub3RlKCdVcGRhdGVkIHRvIHJldmlzaW9uICVzLicgJSAocmV2bm8sKSkK
> Cg==
>
> === modified file bzrlib/workingtree.py // encoding:base64
> LS0tIGJ6cmxpYi93b3JraW5ndHJlZS5weQorKysgYnpybGliL3dvcmtpbmd0cmVlLnB5CkBAIC0x
> MzgzLDcgKzEzODMsNyBAQAogICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yKHNlbGYu
> dW5sb2NrKQogCiAgICAgQG5lZWRzX3dyaXRlX2xvY2sKLSAgICBkZWYgdXBkYXRlKHNlbGYscmV2
> aXNpb249Tm9uZSk6CisgICAgZGVmIHVwZGF0ZShzZWxmLHJldmlzaW9uPU5vbmUsb2xkX3RpcD0i
> bm90X2NvbXB1dGVkIik6CiAgICAgICAgICIiIlVwZGF0ZSBhIHdvcmtpbmcgdHJlZSBhbG9uZyBp
> dHMgYnJhbmNoLgogCiAgICAgICAgIFRoaXMgd2lsbCB1cGRhdGUgdGhlIGJyYW5jaCBpZiBpdHMg
> Ym91bmQgdG9vLCB3aGljaCBtZWFucyB3ZSBoYXZlIG11bHRpcGxlIHRyZWVzIGludm9sdmVkOgpA
> QCAtMTQwMiw3ICsxNDAyLDggQEAKICAgICAgICAgTWVyZ2UgY3VycmVudCBzdGF0ZSAtPiBiYXNp
> cyB0cmVlIG9mIHRoZSBtYXN0ZXIgdy5yLnQuIHRoZSBvbGQgdHJlZSBiYXNpcy4KICAgICAgICAg
> RG8gYSAnbm9ybWFsJyBtZXJnZSBvZiB0aGUgb2xkIGJyYW5jaCBiYXNpcyBpZiBpdCBpcyByZWxl
> dmFudC4KICAgICAgICAgIiIiCi0gICAgICAgIG9sZF90aXAgPSBzZWxmLmJyYW5jaC51cGRhdGUo
> KQorICAgICAgICBpZiBvbGRfdGlwID09ICJub3RfY29tcHV0ZWQiOgorICAgICAgICAgICAgb2xk
> X3RpcCA9IHNlbGYuYnJhbmNoLnVwZGF0ZSgpCiAgICAgICAgIGlmIG9sZF90aXAgaXMgbm90IE5v
> bmU6CiAgICAgICAgICAgICBzZWxmLmFkZF9wZW5kaW5nX21lcmdlKG9sZF90aXApCiAgICAgICAg
> IHNlbGYuYnJhbmNoLmxvY2tfcmVhZCgpCgo=
>
> # revision id: Matthieu.Moy at imag.fr-20060802114722-df1fc09ca6d1a6d5
> # sha1: 093ca397d5e408578f1afddc281a423098598ef3
> # inventory sha1: 67b79c6b69bc0021b8a5a6e2123b5a73691ab196
> # parent ids:
> # Matthieu.Moy at imag.fr-20060802094425-91359097507c332a
> # properties:
> # branch-nick: bzr.moy
>
> # message:
> # update -r implemented
> # committer: Matthieu Moy <Matthieu.Moy at imag.fr>
> # date: Wed 2006-08-02 15:14:25.003000021 +0530
>
> === modified file bzrlib/builtins.py // encoding:base64
> LS0tIGJ6cmxpYi9idWlsdGlucy5weQorKysgYnpybGliL2J1aWx0aW5zLnB5CkBAIC04MDksMjQg
> KzgwOSwzNCBAQAogICAgICdienIgcmV2ZXJ0JyBpbnN0ZWFkIG9mICdienIgY29tbWl0JyBhZnRl
> ciB0aGUgdXBkYXRlLgogICAgICIiIgogICAgIHRha2VzX2FyZ3MgPSBbJ2Rpcj8nXQorICAgIHRh
> a2VzX29wdGlvbnMgPSBbJ3JldmlzaW9uJ10KICAgICBhbGlhc2VzID0gWyd1cCddCiAKLSAgICBk
> ZWYgcnVuKHNlbGYsIGRpcj0nLicpOgorICAgIGRlZiBydW4oc2VsZiwgZGlyPScuJywgcmV2aXNp
> b249Tm9uZSk6CisgICAgICAgIGlmIHJldmlzaW9uIGlzIG5vdCBOb25lIGFuZCBsZW4ocmV2aXNp
> b24pICE9IDE6CisgICAgICAgICAgICByYWlzZSBCenJDb21tYW5kRXJyb3IoImJ6ciB1cGRhdGUg
> LS1yZXZpc2lvbiB0YWtlcyBleGFjdGx5IG9uZSByZXZpc2lvbiIpCiAgICAgICAgIHRyZWUgPSBX
> b3JraW5nVHJlZS5vcGVuX2NvbnRhaW5pbmcoZGlyKVswXQorICAgICAgICBiID0gdHJlZS5icmFu
> Y2gKICAgICAgICAgdHJlZS5sb2NrX3dyaXRlKCkKICAgICAgICAgZXhpc3RpbmdfcGVuZGluZ19t
> ZXJnZXMgPSB0cmVlLnBlbmRpbmdfbWVyZ2VzKCkKICAgICAgICAgdHJ5OgotICAgICAgICAgICAg
> bGFzdF9yZXYgPSB0cmVlLmxhc3RfcmV2aXNpb24oKSAKLSAgICAgICAgICAgIGlmIGxhc3RfcmV2
> ID09IHRyZWUuYnJhbmNoLmxhc3RfcmV2aXNpb24oKToKKyAgICAgICAgICAgIGlmIHJldmlzaW9u
> IGlzIG5vdCBOb25lOgorICAgICAgICAgICAgICAgIGxhc3RfcmV2ID0gcmV2aXNpb25bMF0uaW5f
> aGlzdG9yeShiKS5yZXZfaWQKKyAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgbGFz
> dF9yZXYgPSBiLmxhc3RfcmV2aXNpb24oKQorICAgICAgICAgICAgaWYgdHJlZS5sYXN0X3Jldmlz
> aW9uKCkgPT0gbGFzdF9yZXY6CiAgICAgICAgICAgICAgICAgIyBtYXkgYmUgdXAgdG8gZGF0ZSwg
> Y2hlY2sgbWFzdGVyIHRvby4KLSAgICAgICAgICAgICAgICBtYXN0ZXIgPSB0cmVlLmJyYW5jaC5n
> ZXRfbWFzdGVyX2JyYW5jaCgpCisgICAgICAgICAgICAgICAgbWFzdGVyID0gYi5nZXRfbWFzdGVy
> X2JyYW5jaCgpCiAgICAgICAgICAgICAgICAgaWYgbWFzdGVyIGlzIE5vbmUgb3IgbGFzdF9yZXYg
> PT0gbWFzdGVyLmxhc3RfcmV2aXNpb24oKToKLSAgICAgICAgICAgICAgICAgICAgcmV2bm8gPSB0
> cmVlLmJyYW5jaC5yZXZpc2lvbl9pZF90b19yZXZubyhsYXN0X3JldikKKyAgICAgICAgICAgICAg
> ICAgICAgcmV2bm8gPSBiLnJldmlzaW9uX2lkX3RvX3Jldm5vKGxhc3RfcmV2KQogICAgICAgICAg
> ICAgICAgICAgICBub3RlKCJUcmVlIGlzIHVwIHRvIGRhdGUgYXQgcmV2aXNpb24gJWQuIiAlIChy
> ZXZubywpKQogICAgICAgICAgICAgICAgICAgICByZXR1cm4gMAotICAgICAgICAgICAgY29uZmxp
> Y3RzID0gdHJlZS51cGRhdGUoKQotICAgICAgICAgICAgcmV2bm8gPSB0cmVlLmJyYW5jaC5yZXZp
> c2lvbl9pZF90b19yZXZubyh0cmVlLmxhc3RfcmV2aXNpb24oKSkKLSAgICAgICAgICAgIG5vdGUo
> J1VwZGF0ZWQgdG8gcmV2aXNpb24gJWQuJyAlIChyZXZubywpKQorICAgICAgICAgICAgY29uZmxp
> Y3RzID0gdHJlZS51cGRhdGUobGFzdF9yZXYpCisgICAgICAgICAgICB0cnk6CisgICAgICAgICAg
> ICAgICAgcmV2bm8gPSBzdHIoYi5yZXZpc2lvbl9pZF90b19yZXZubyhsYXN0X3JldikpCisgICAg
> ICAgICAgICBleGNlcHQgZXJyb3JzLk5vU3VjaFJldmlzaW9uOgorICAgICAgICAgICAgICAgIHJl
> dm5vID0gbGFzdF9yZXYKKyAgICAgICAgICAgIG5vdGUoJ1VwZGF0ZWQgdG8gcmV2aXNpb24gJXMu
> JyAlIChyZXZubywpKQogICAgICAgICAgICAgaWYgdHJlZS5wZW5kaW5nX21lcmdlcygpICE9IGV4
> aXN0aW5nX3BlbmRpbmdfbWVyZ2VzOgogICAgICAgICAgICAgICAgIG5vdGUoJ1lvdXIgbG9jYWwg
> Y29tbWl0cyB3aWxsIG5vdyBzaG93IGFzIHBlbmRpbmcgbWVyZ2VzIHdpdGggJwogICAgICAgICAg
> ICAgICAgICAgICAgIidienIgc3RhdHVzJywgYW5kIGNhbiBiZSBjb21taXR0ZWQgd2l0aCAnYnpy
> IGNvbW1pdCcuIikKCg==
>
> === modified file bzrlib/workingtree.py // encoding:base64
> LS0tIGJ6cmxpYi93b3JraW5ndHJlZS5weQorKysgYnpybGliL3dvcmtpbmd0cmVlLnB5CkBAIC0x
> MzgzLDcgKzEzODMsNyBAQAogICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yKHNlbGYu
> dW5sb2NrKQogCiAgICAgQG5lZWRzX3dyaXRlX2xvY2sKLSAgICBkZWYgdXBkYXRlKHNlbGYpOgor
> ICAgIGRlZiB1cGRhdGUoc2VsZixyZXZpc2lvbj1Ob25lKToKICAgICAgICAgIiIiVXBkYXRlIGEg
> d29ya2luZyB0cmVlIGFsb25nIGl0cyBicmFuY2guCiAKICAgICAgICAgVGhpcyB3aWxsIHVwZGF0
> ZSB0aGUgYnJhbmNoIGlmIGl0cyBib3VuZCB0b28sIHdoaWNoIG1lYW5zIHdlIGhhdmUgbXVsdGlw
> bGUgdHJlZXMgaW52b2x2ZWQ6CkBAIC0xNDA3LDE2ICsxNDA3LDE4IEBACiAgICAgICAgICAgICBz
> ZWxmLmFkZF9wZW5kaW5nX21lcmdlKG9sZF90aXApCiAgICAgICAgIHNlbGYuYnJhbmNoLmxvY2tf
> cmVhZCgpCiAgICAgICAgIHRyeToKKyAgICAgICAgICAgIGlmIHJldmlzaW9uIGlzIE5vbmU6Cisg
> ICAgICAgICAgICAgICAgcmV2aXNpb24gPSBzZWxmLmJyYW5jaC5sYXN0X3JldmlzaW9uKCkKICAg
> ICAgICAgICAgIHJlc3VsdCA9IDAKLSAgICAgICAgICAgIGlmIHNlbGYubGFzdF9yZXZpc2lvbigp
> ICE9IHNlbGYuYnJhbmNoLmxhc3RfcmV2aXNpb24oKToKKyAgICAgICAgICAgIGlmIHNlbGYubGFz
> dF9yZXZpc2lvbigpICE9IHJldmlzaW9uOgogICAgICAgICAgICAgICAgICMgbWVyZ2UgdHJlZSBz
> dGF0ZSB1cCB0byBuZXcgYnJhbmNoIHRpcC4KICAgICAgICAgICAgICAgICBiYXNpcyA9IHNlbGYu
> YmFzaXNfdHJlZSgpCi0gICAgICAgICAgICAgICAgdG9fdHJlZSA9IHNlbGYuYnJhbmNoLmJhc2lz
> X3RyZWUoKQorICAgICAgICAgICAgICAgIHRvX3RyZWUgPSBzZWxmLmJyYW5jaC5yZXBvc2l0b3J5
> LnJldmlzaW9uX3RyZWUocmV2aXNpb24pCiAgICAgICAgICAgICAgICAgcmVzdWx0ICs9IG1lcmdl
> X2lubmVyKHNlbGYuYnJhbmNoLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
> ICB0b190cmVlLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBiYXNpcywK
> ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGhpc190cmVlPXNlbGYpCi0g
> ICAgICAgICAgICAgICAgc2VsZi5zZXRfbGFzdF9yZXZpc2lvbihzZWxmLmJyYW5jaC5sYXN0X3Jl
> dmlzaW9uKCkpCisgICAgICAgICAgICAgICAgc2VsZi5zZXRfbGFzdF9yZXZpc2lvbihyZXZpc2lv
> bikKICAgICAgICAgICAgIGlmIG9sZF90aXAgYW5kIG9sZF90aXAgIT0gc2VsZi5sYXN0X3Jldmlz
> aW9uKCk6CiAgICAgICAgICAgICAgICAgIyBvdXIgbGFzdCByZXZpc2lvbiB3YXMgbm90IHRoZSBw
> cmlvciBicmFuY2ggbGFzdCByZXZpc2lvbgogICAgICAgICAgICAgICAgICMgYW5kIHdlIGhhdmUg
> Y29udmVydGVkIHRoYXQgbGFzdCByZXZpc2lvbiB0byBhIHBlbmRpbmcgbWVyZ2UuCkBAIC0xNDI0
> LDcgKzE0MjYsNyBAQAogICAgICAgICAgICAgICAgICMgYW5kIHRoZSBub3cgcGVuZGluZyBtZXJn
> ZQogICAgICAgICAgICAgICAgIGZyb20gYnpybGliLnJldmlzaW9uIGltcG9ydCBjb21tb25fYW5j
> ZXN0b3IKICAgICAgICAgICAgICAgICB0cnk6Ci0gICAgICAgICAgICAgICAgICAgIGJhc2VfcmV2
> X2lkID0gY29tbW9uX2FuY2VzdG9yKHNlbGYuYnJhbmNoLmxhc3RfcmV2aXNpb24oKSwKKyAgICAg
> ICAgICAgICAgICAgICAgYmFzZV9yZXZfaWQgPSBjb21tb25fYW5jZXN0b3IocmV2aXNpb24sCiAg
> ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9sZF90aXAs
> CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYu
> YnJhbmNoLnJlcG9zaXRvcnkpCiAgICAgICAgICAgICAgICAgZXhjZXB0IGVycm9ycy5Ob0NvbW1v
> bkFuY2VzdG9yOgoK
>
> # revision id: Matthieu.Moy at imag.fr-20060802094425-91359097507c332a
> # sha1: 5c6bb10a528bae3930726a3c357f12fc1f17278b
> # inventory sha1: 76b2e4d1183a5155656d5b474c0fab2eab262c14
> # parent ids:
> # pqm at pqm.ubuntu.com-20060802020654-9d81db40bba14f69
> # properties:
> # branch-nick: bzr.moy
>
>
> ----------------------------------------------------------------------
>
>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFFgAcCgoxTFTi1P8QRAvehAKCPSfMK9rwe6Qt++Qmn5RoFKeAAjQCdEJMJ
0bdV3r5VnHnhtxyh/jjPMm8=
=p9qK
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list