--- a/.hgignore Thu Aug 23 18:09:45 2012 +0200
+++ b/.hgignore Thu Jun 26 15:27:25 2014 +0100
@@ -5,6 +5,12 @@
^html/
\.pyc$
~$
+\.swp$
\.orig$
\.rej$
\.err$
+^tests/easy_run.sh$
+^build/
+^MANIFEST$
+^docs/tutorials/.*\.rst$
+\.ico$
--- a/.hgtags Thu Aug 23 18:09:45 2012 +0200
+++ b/.hgtags Thu Jun 26 15:27:25 2014 +0100
@@ -8,3 +8,18 @@
18a0d96ed559089edf90206c469f3f8c26681c64 0.7
18a0d96ed559089edf90206c469f3f8c26681c64 0.7
1b2757c1bd918509184f6c1d06b2329a847e31b0 0.7
+b18b000363550f02f413aed008f8e306318c608c 1.0.0
+ca5bb72d14aeb6e6053e3a53c064a2b7dc8010e5 1.0.1
+b1bdcb4506defef0e857e2710633f7686d8034a5 1.0.2
+5559e5a4b656978c592d364f242edc62369d7e84 1.0.2
+c062edbcaf13135d0312fd2039deca74573ff4f0 1.1.0
+22cacfce2a65ab965c6179ae862b148f4abc7d8a 1.1.0
+d43e80504e55db9ad4826e860e50530103a27b0f 2.0.0
+f9d305deeff3dba782e65faf4ef3fd1569995859 2.1.0
+862b6b71a35836e81f090ba7229c2888e8ed2f9f 3.0.0
+cdb52bbbe5b8770d5e68943b7e73bee4ba136ecc 3.1.0
+c3ba8a965a7a173e388d84819e936ea9bae9797f 3.2.0
+83882f2fbecba0b7e7f7e5d490b57db93bd7fa22 3.3.0
+fc04758ea9f549684989ee673b04d9724756dc85 3.3.1
+a03ea39aca2a66ea36817512d586dcbc99dbfe9b 3.3.2
+0304fc2bab158658df53a8f4edd5aa300a9497d2 4.0.0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/COPYING Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MANIFEST.in Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,17 @@
+recursive-include docs/figures *.svg
+include docs/figures/hgview-example.png
+include docs/*.rst
+include docs/*.py
+include docs/tutorials/*.t
+include docs/makefile
+include docs/static/*.svg
+include hgext/__init__.py
+include hgext/evolve.py
+include hgext/pushexperiment.py
+include setup.py
+include README
+include COPYING
+include tests/*.t
+include tests/*.py
+exclude tests/test-oldconvert.t
+exclude tests/test-qsync.t
--- a/Makefile Thu Aug 23 18:09:45 2012 +0200
+++ b/Makefile Thu Jun 26 15:27:25 2014 +0100
@@ -1,5 +1,7 @@
PYTHON=python
HG=`which hg`
+VERSION=$(shell python setup.py --version)
+
help:
@echo 'Commonly used make targets:'
@@ -24,4 +26,13 @@
all-version-tests: tests-1.3.1 tests-1.4.3 tests-1.5.4 \
tests-1.6.4 tests-1.7.5 tests-1.8 tests-tip
+deb-prepare:
+ python setup.py sdist --dist-dir ..
+ mv -f ../hg-evolve-$(VERSION).tar.gz ../mercurial-evolve_$(VERSION).orig.tar.gz
+ tar xf ../mercurial-evolve_$(VERSION).orig.tar.gz
+ rm -rf ../mercurial-evolve_$(VERSION).orig
+ mv hg-evolve-$(VERSION) ../mercurial-evolve_$(VERSION).orig
+ cp -r debian/ ../mercurial-evolve_$(VERSION).orig/
+ @cd ../mercurial-evolve_$(VERSION).orig && echo 'debian build directory ready at' `pwd`
+
.PHONY: tests all-version-tests
--- a/README Thu Aug 23 18:09:45 2012 +0200
+++ b/README Thu Jun 26 15:27:25 2014 +0100
@@ -2,46 +2,179 @@
Mutable History For Mercurial
=============================
-:obsolete:
-
- Introduce an ``obsolete`` concept that tracks new versions of rewritten
- changesets.
+This package supplies the ``evolve`` extension for Mercurial, which
+provides several commands to mutate history and deal with the
+resulting issues.
-:evolve:
+It also:
- A collection of commands to rewrite the mutable part of the history.
-
-
+ - enables the "changeset obsolescence" feature of Mercurial
+ - issues several warning messages when trouble appears in your repository
-**These extensions are experimental and are not meant for production.**
+**This extension is experimental and not yet meant for production.**
-You can quicky enable them using::
-
- ./enable.sh >> ~/.hgrc
+You can enable it by adding the line below to the ``extensions``
+section of your hgrc::
-But it's recommended to look at the doc in the first place.
+ evolve = PATH/TO/mutable-history/hgext/evolve.py
-See doc/ directory for details.
-
-Online version of the doc is available:
+We recommend reading the documentation first. An online version is
+available here:
http://hg-lab.logilab.org/doc/mutable-history/html/
+Or see the ``doc/`` directory for a local copy.
+
Contribute
-==================
+==========
-The simplest way to contribute is to issue a pull request on bitbucket.
+The simplest way to contribute is to issue a pull request on Bitbucket
+(https://bitbucket.org/marmoute/mutable-history). Please don't forget
+to update and run the tests when you fix a bug or add a feature. To
+run the tests:
-However, some cutting edge change may be found in a mutable repository hosted
+ cd tests
+ python run-tests.py --with-hg=/path/to/hg
+
+However, some cutting-edge changes may be found in a mutable repository hosted
by logilab before they are published.
http://hg-lab.logilab.org/wip/mutable-history/
-Make sure to check lastest draft changeset before submitting new changeset.
+Be sure to check latest draft changeset before submitting new changesets.
Changelog
-==================
+=========
+
+4.0.0 -- 2014-06-03
+
+- require Mercurial version 3.0.1 or above
+- some compatibility fixes with future 3.1.0
+- deprecated `gup` and `gdown` in favor of prev and next
+- record parent of pruned parent at prune time
+- added a `debugobsstorestat` command to gather data on obsmarker content.
+- added a `debugrecordpruneparents` command to upgrade existing prune marker
+ with parent information. Please run it once per repo after upgrading.
+- improvement to obsolescence marker exchange:
+ - added progress when pushing obsmarkers
+ - added multiple output during obsolescence markers exchange
+ - only push markers relevant to pushed subset
+ - add a new experimental way to exchange marker (when server support):
+ - added progress when pulling obsmarkers
+ - only pull markers relevant to pulled subset
+ - avoid exchanging common markers in some case
+ - use bundle2 as transport when available.
+ - add a hook related to the new commands
+
+3.3.2 -- 2014-05-14
+
+- fix a bug where evolve were creating changeset with 2 parents on windows
+ (fix issues #16, #35 and #42)
+- adds a --obsolete flag to import (requieres Mercurial 3.0)
+- prune: update to successor rather than parent when pruning '.' with -s
+- fold: add missing --message and --logfile option
+- fold: add squash as an alias
+
+3.3.1 -- 2014-04-23
+
+- various language fix
+- active bookmark now move when using prev/next (#37)
+- fix some preservation of rename information on evolve (#33)
+- abort when evolve tries to move a node on top of itself (will helps on the #35 front)
+- fold: enable --date and --user options
+
+3.3.0 -- 2014-03-04
+
+- raise Mercurial's minimal requirement to 2.7
+- drop `latercomer` and `conflicting` compatibility. Those old alias are
+ deprecated for a long time now.
+- add verbose hint about how to handle corner case by hand.
+ This should help people until evolve is able to to it itself.
+- removed the qsync extension. The only user I knew about (logilab) is not
+ using it anymore. It not compatible with coming Mercurial version 2.9.
+- add progress indicator for long evolve command
+- report troubles creation from `hg import`
+
+3.2.0 -- 2013-11-15
+
+- conform to the Mercurial custom of lowercase messages
+- added a small extension to experiment with obsolescence marker push
+- amend: drop the deprecated note option
+- amend: use core mechanism for amend (fix multiple bugs)
+- parents command: add "working directory parent is obsolete" message
+- evolve command: allow updating to the successor if the parent is
+ obsolete
+- gdown and gup commands: add next and previous alias, respectively
+- make grab aliases compatible with Mercurial 2.8
+- Tested with 2.6, 2.7 and 2.8
+
+3.1.0 -- 2013-02-11
+
+- amend: drop deprecated --change option for amend
+- alias: add a grab aliast to be used instead of graft -O
+- touch: add a --duplicate option to *not* obsolete the old version
+- touch: fix touching multiple revision at the same time
+- evolve: add a --all option
+- prune: various minor improvements
+- prune: add option to prune a specific bookmark
+- prune: add -u and -d option to control metadata
+
+3.0.0 -- 2013-02-02
+
+- compatibility with 2.5
+
+2.2.0 --
+
+- make evolve smarter at picking next troubled to solved without --any
+
+2.1.0 -- 2012-12-03
+
+- qsync fixes
+- have qfold ask for commit message
+
+2.0.0 -- 2012-10-26
+
+- compat with mercurial 2.4
+
+1.1.0 -- 2012-10-26
+
+- fix troubles creation reporting from rebase
+- rename latecomer to bumped
+- renamed conflicting to divergent
+- smarter divergent handling
+
+1.0.2 -- 2012-09-19
+
+- fix hg fold bug
+- fix hg pull --rebase
+- fix detection of conflict with external tools
+- adapt to core movement (caches and --amend)
+
+1.0.1 -- 2012-08-31
+
+- documentation improvement
+- fix a performance bug with hgweb
+
+1.0 -- 2012-08-29
+
+- Align with Mercurial version 2.3 (drop 2.2 support).
+- stabilize handle killed parent
+- stabilize handle late comer
+- stabilize handle conflicting
+- stabilize get a --continue switch
+- merge and update ignore extinct changeset in most case.
+- new "troubled()" revset
+- summary now reports troubles changesets
+- new touch command
+- new fold command
+- new basic olog alias
+
+- rebase refuse to work on public changeset again
+- rebase explicitly state that there is nothing to rebase because everything is
+ extinct() when that happen.
+- amend now cleanly abort when --change switch is misused
+
0.7 -- 2012-08-06
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/nopushpublish.py Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,36 @@
+# Extension which prevent changeset to be turn public by push operation
+#
+# Copyright 2011 Logilab SA <contact@logilab.fr>
+#
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2 or any later version.
+
+
+from mercurial import extensions, util
+from mercurial import discovery
+
+def checkpublish(orig, repo, remote, outgoing, *args):
+
+ # is remote publishing?
+ publish = True
+ if 'phases' in remote.listkeys('namespaces'):
+ remotephases = remote.listkeys('phases')
+ publish = remotephases.get('publishing', False)
+
+ npublish = 0
+ if publish:
+ for rev in outgoing.missing:
+ if repo[rev].phase():
+ npublish += 1
+ if npublish:
+ repo.ui.warn("Push would publish %s changesets" % npublish)
+
+ ret = orig(repo, remote, outgoing, *args)
+ if npublish:
+ raise util.Abort("Publishing push forbiden",
+ hint="Use `hg phase -p <rev>` to manually publish them")
+
+ return ret
+
+def uisetup(ui):
+ extensions.wrapfunction(discovery, 'checkheads', checkpublish)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/changelog Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,46 @@
+mercurial-evolve (4.0.0-1) UNRELEASED; urgency=low
+
+ [ Julien Cristau ]
+ * New upstream release.
+
+ [ Pierre-Yves David ]
+ * new upstream release
+
+ -- Pierre-Yves David <pyd@marginatus.alto.octopoid.net> Tue, 03 Jun 2014 15:37:23 -0700
+
+mercurial-evolve (3.1.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Pierre-Yves David <pierre-yves.david@logilab.fr> Mon, 04 Mar 2013 18:02:15 +0100
+
+mercurial-evolve (2.1.0-1) UNRELEASED; urgency=low
+
+ * New upstream release
+
+ -- Pierre-Yves David <pierre-yves.david@logilab.fr> Mon, 03 Dec 2012 15:19:19 +0100
+
+mercurial-evolve (1.1.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Pierre-Yves David <pierre-yves.david@logilab.fr> Tue, 20 Nov 2012 16:28:12 +0100
+
+mercurial-evolve (1.0.2-1) UNRELEASED; urgency=low
+
+ * New upstream Release
+
+ -- Pierre-Yves David <pierre-yves.david@logilab.fr> Wed, 19 Sep 2012 17:38:47 +0200
+
+mercurial-evolve (1.0.1-1) UNRELEASED; urgency=low
+
+ * New bug fix release
+ * remove conflicting __init__.py
+
+ -- Pierre-Yves David <pierre-yves.david@logilab.fr> Fri, 31 Aug 2012 11:31:03 +0200
+
+mercurial-evolve (1.0.0-1) UNRELEASED; urgency=low
+
+ * Initial release.
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 24 Aug 2012 16:46:30 +0200
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/compat Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,1 @@
+8
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/control Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,39 @@
+Source: mercurial-evolve
+Section: vcs
+Priority: optional
+Maintainer: Logilab <contact@logilab.fr>
+Uploaders:
+ Julien Cristau <julien.cristau@logilab.fr>,
+ Pierre-Yves David <pierre-yves.david@logilab.fr>,
+Standards-Version: 3.9.3
+Build-Depends:
+ mercurial (>=2.6~),
+ python,
+ debhelper (>= 8),
+ python-sphinx (>= 1.0.8),
+ imagemagick,
+ librsvg2-bin,
+Python-Version: >= 2.6
+Homepage: https://bitbucket.org/marmoute/mutable-history
+
+Package: mercurial-evolve
+Architecture: all
+Depends:
+ ${python:Depends},
+ ${misc:Depends},
+ mercurial (>= 2.6),
+Description: evolve extension for Mercurial
+ This package provides the experimental "evolve" extension for the Mercurial
+ DVCS.
+ .
+ This extension provides several commands to mutate history and deal with issues
+ it may raise.
+ .
+ It also:
+ - enables the "Changeset Obsolescence" feature of mercurial,
+ - alters core command and extension that rewrite history to use this feature,
+ - improves some aspects of the early implementation in Mercurial 2.3.
+ .
+ **These extensions are experimental and are not meant for production.**
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/copyright Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,15 @@
+This software was downloaded from
+https://bitbucket.org/marmoute/mutable-history
+
+Copyright 2011 Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
+ Logilab SA <contact@logilab.fr>
+ Pierre-Yves David <pierre-yves.david@ens-lyon.org>
+ Patrick Mezard <patrick@mezard.eu>
+
+
+This software may be used and distributed according to the terms of the GNU
+General Public License version 2 or any later version.
+
+On Debian systems, the complete text of the GNU General Public License version
+2 can be found in `/usr/share/common-licenses/GPL-2'.
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/docs Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,1 @@
+html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/rules Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,27 @@
+#!/usr/bin/make -f
+
+clean %:
+ dh $@ --with python2 --buildsystem=python_distutils
+
+build:
+ dh build --with python2 --buildsystem=python_distutils
+ $(MAKE) -C docs
+
+ifeq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))
+override_dh_auto_test:
+ cd tests && python run-tests.py --with-hg=`which hg`
+endif
+
+override_dh_python2:
+ # avoid conflict with mercurial's own hgext/__init__.py
+ find debian -name __init__.py -delete
+ dh_python2
+
+clean: clean-docs
+
+clean-docs:
+ rm -rf html
+ rm -f docs/static/logo-evolve.ico
+ rm -f docs/tutorials/tutorial.rst
+
+.PHONY: build clean clean-docs
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/source/format Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,1 @@
+3.0 (quilt)
--- a/docs/conf.py Thu Aug 23 18:09:45 2012 +0200
+++ b/docs/conf.py Thu Jun 26 15:27:25 2014 +0100
@@ -73,17 +73,17 @@
# The name of an image file (within the static path) to place at the top of
# the sidebar.
-#html_logo = None
+#html_logo = 'logo-evolve.svg'
# The name of an image file (within the static path) to use as favicon of the
# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
# pixels large.
-#html_favicon = None
+html_favicon = 'logo-evolve.ico'
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['.static']
+html_static_path = ['static']
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
--- a/docs/evolve-collaboration.rst Thu Aug 23 18:09:45 2012 +0200
+++ b/docs/evolve-collaboration.rst Thu Jun 26 15:27:25 2014 +0100
@@ -1,3 +1,5 @@
+.. Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org>
+.. Logilab SA <contact@logilab.fr>
------------------------------------------------
Collaboration Using Evolve: A user story
@@ -10,7 +12,7 @@
$ hg ci -m '[entities] remove magic'
-Instant patch ! Note how the default phase of this changeset is (still)
+Instant patch! Note how the default phase of this changeset is (still)
in "draft" state.
This is easily checkable::
@@ -28,7 +30,7 @@
"publishing" since they do not have the notion of non-public changesets
(or mutable history).
-During the transition from older mercurial servers to new ones, this will
+During the transition from older Mercurial servers to new ones, this will
happen often, so be careful.
Now let's come back to our patch. Next hour sees good progress and Alice
@@ -37,7 +39,7 @@
$ hg amend -m '[entities] fix frobulator (closes #42)'
-Note that we also fix the commit message. (For recovering mq users: this
+Note that we also fix the commit message. (For recovering MQ users: this
is just like "hg qrefresh -m").
Before leaving, let's push to the central shared repository. That will
@@ -63,7 +65,7 @@
brings her to yesterday's patch. Indeed the patch serial number has
increased (827 still exists but has been obsoleted).
-She understands that his original patch has been altered. But how did it
+She understands that her original patch has been altered. But how did it
evolve?
The enhanced hgview shows the two patches. By default only the most
@@ -82,7 +84,7 @@
Amend ... Stabilize
--------------------
-Almost perfect ! Alice just needs to fix a half dozen grammar oddities in
+Almost perfect! Alice just needs to fix a half dozen grammar oddities in
the new docstrings and it will be publishable.
Then, another round of:
@@ -111,7 +113,7 @@
Being now done with grammar and typo fixes, Alice decides it is time to
stabilize again the tree. She does::
- $ hg stabilize
+ $ hg evolve
two times, one for each unstable descendant. The last time, hgview
shows her a straight line again. Wow! that feels a bit like a
@@ -125,7 +127,7 @@
Except that rebase is a destructive (it removes information from the
repository), unrecoverable operation, and the "evolve + obsolete"
-combo, using changeset copy and obsolescence marker, provide evolution
+combo, using changeset copy and obsolescence marker, provides evolution
semantics by only adding new information to the repository (but more
on that later).
--- a/docs/evolve-faq.rst Thu Aug 23 18:09:45 2012 +0200
+++ b/docs/evolve-faq.rst Thu Jun 26 15:27:25 2014 +0100
@@ -1,3 +1,5 @@
+.. Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org>
+.. Logilab SA <contact@logilab.fr>
---------------------------------------------------------------------
Evolve How To
@@ -10,64 +12,38 @@
Just use commit as usual. New changesets will be in the `draft` phase.
-Rewrite a changeset: ``amend``
+Rewrite a changeset: ``commit --amend``
------------------------------------------------------------
-A new command ``hg amend`` is added by the extension. It writes a new
-changeset combining working-directory parent changes and parent. It
-will work on any `draft` or `secret` changeset. It will not work on
-`public` changesets.
+It writes a new changeset combining working-directory parent changes and parent.
+It will work on any `draft` or `secret` changeset. It will not work on `public`
+changesets.
To understand what the result of amend will be I use the two following
-aliases [#]_::
+aliases [#]_::
- # diff what amend will look likes
+ # diff what amend will look like
pdiff=diff --rev .^
- # status what amend will look likes
+ # status what amend will look like
pstatus=status --rev .^
-It takes various options to pick an author, a date and the branch of the
-result... (see ``hg help amend`` for details).
-
-This command can even be invoked on changesets with children (provided
-none is public) !
+This command can even be invoked on changesets with children, provided
+none are public.
-.. note:: the amend command is very similar to mq's ``qrefresh``, a ``refresh``
- alias for amend is also available. But note that contrary to
- ``qrefresh``, ``amend`` does not exclude changes on file not specified
- on the command line.
-
- XXX add idank example
-
-
-.. [#] (added by enable.sh)
+.. [#] (defined by the evolve extension for you)
-Move a changeset: ``graft``
+Move a changeset: ``grab``
------------------------------------------------------------
-The graft command introduced in 2.0 allows to "copy changes from other
-branches onto the current branch".
-
-The graft command has been altered to allow the creation of an
-obsolete marker indicating both the result cset and its source
-(actually recording changeset movements).
-
-This is achieved using a new flag `-O` (or `old-obsolete`) [#]_.
-
+You can use ``hg grab <rev>`` to move a rev at your current location, making the
+old version obsolete.
-XXX example
-
-.. warning:: when using graft --continue after conflict resolution you **MUST**
- pass `-O` or `-o` flag again because they are not saved for now
+.. note:: grab is an alias for ``hg rebase --dest . --rev $@; hg up <result>``
-.. [#] add this `-O` to graft instead of a dedicated command is probably
- abusive. But this was very convenient for experimental purposes.
- This will likely change in non experimental release.
-
Delete a changeset: ``prune``
------------------------------------------------------------
@@ -75,30 +51,38 @@
Just use ``hg prune <some-rev>``.
-Moving within the history: ``up`` ``gdown`` and ``gup``
+
+Moving within the history: ``gdown`` and ``gup``
------------------------------------------------------------
While working on mutable part of the history you often need to move between
-mutable commit.
+mutable commits.
You just need to use standard update to work with evolve. For convenience, you
-can use ``hg gup`` to move to children commit or ``hg gdown`` to move to working
-directory parent commit.
+can use ``hg gup`` to move to the child commit or ``hg gdown`` to move to the parent commit.
-.. note:: those command only exist for the convenience of getting qpush and qpop
+Those command have ``previous`` and ``next`` alias.
+
+.. note:: Those commands only exist for the convenience of getting qpush and qpop
feeling back.
-Collapse changesets: ``amend``
+Collapse changesets: ``fold``
------------------------------------------------------------
-you can use amend -c to collapse multiple changeset in a single one.
+You can use ``hg fold`` to collapse multiple changesets in a single one.
+
+It takes two forms:
+
+``hg fold <rev>`` folds everything from you current changeset to `<rev>`
+
+``hg fold -r <revset>`` fold everything changeset matching the revset together.
Getting changes out of a commit
------------------------------------------------------------
-the ``hg uncommit`` commands allow you to rewrite the current commit to not
-include change for some file. The content of target files are not altered on
-disk and back as "modified"::
+The ``hg uncommit`` command lets you rewrite the parent commit without
+selected changed files. Target files content is not altered and
+appears again as "modified"::
$ hg st
M babar
@@ -112,10 +96,9 @@
Split a changeset
-----------------------
-I you just want to split whole file, you can just use the ``uncommit`` command.
+To split on file boundaries, just use ``uncommit`` command.
-
-If you need fine-grained split, there is no official command for that yet.
+If you need a fine-grained split, there is no official command for that yet.
However, it is easily achieved by manual operation::
### you want to split changeset A: 42
@@ -131,14 +114,18 @@
# current changeset (.) and previous one (.^) replace A (42)
$ hg prune --new . --new .^ 42
+For more complexe scenario we recommend the use of the histedit_ extension.
-Update my current work in progess after a pull
+.. _histedit: http://mercurial.selenic.com/wiki/HisteditExtension
+
+
+Update my current work in progress after a pull
----------------------------------------------
-Whenever you are working on some changesets, it is more likely that a pull
+Whenever you are working on some changesets, it is more likely that a pull
will, eventually, import new changesets in your tree.
-And it is likely that you will want your work in progress changsets to be
+And it is likely that you will want your work in progress changesets to be
rebased on the top of this newly imported subtree.
Doing so is only a matter of rebasing.
@@ -150,10 +137,10 @@
You can still use rebase to move a whole segment of the changeset graph together.
-.. warning:: Beware that rebasing obsolete changesets will result in
- conflicting versions of the changesets.
+.. warning:: Beware that rebasing changesets already obsolete will likely result in
+ divergent versions of the changesets.
-Stabilize history: ``stabilize``
+Resolve history troubles: ``evolve``
------------------------------------------------------------
When you rewrite (amend) a changeset with children without rewriting
@@ -162,18 +149,9 @@
When you are finished amending a given changeset, you will want to
declare it stable, in other words rebase its former descendants on its
-newest version. This is not done automatically to avoid the
-proliferation of useless hidden changesets.
-
-.. warning:: ``hg stabilize`` have no --continue to use after conflict
- resolution
+newest version.
-.. warning:: stabilization does not handle deletion yet.
-
-.. warning:: obsolete currently relies on changesets in secret phase
- to avoid exchanging obsolete and unstable changesets.
-
- XXX details issue here
+You can also use evolve to solve `bumped` and `divergent` changeset/
Fix my history afterward: ``prune -n``
@@ -182,34 +160,33 @@
Sometimes you need to create an obsolete marker by hand. This may happen when
upstream has applied some of your patches for example.
-you can use ``hg prune --new <new-changeset> <old-changeset>`` to add obsolete
+you can use ``hg prune <old-changeset> --succ <new-changeset>`` to add obsolete
marker.
-Export to mq: ``synchronize``
-------------------------------------------------------------
-
-Another extension allows to export your changes to mq.
-
View diff from the last amend
------------------------------------------------------------
An ``odiff`` alias have been added by ``enable.sh``
-::
+::
[alias]
odiff = diff --rev 'limit(precursors(.),1)' --rev .
View obsolete markers
------------------------------------------------------------
-hgview is the only viewer that support this feature. You need an experimental
-version available here:
+hgview_ is the only viewer that currently supports this feature. You
+need version 1.6.2
- $ hg clone http://hg-dev.octopoid.net/hgwebdir.cgi/hgview/
+.. _hgview: http://www.logilab.org/project/hgview/
+
+.. image:: figures/hgview-example.png
+ :scale: 50%
+
You can also use a debug command
- $ hg debugsuccessors
+ $ hg debugobsolete
5eb72dbe0cb4 e8db4aa611f6
c4cbebac3751 4f1c269eab68
@@ -223,8 +200,10 @@
Extinct changesets are hidden using the *hidden* feature of mercurial.
-Only ``hg log`` and ``hgview`` support it. ``hg glog`` Only support that since
-2.2. Other visual viewer don't.
+Only ``hg log`` and ``hgview`` support it, other
+graphical viewer do not.
+
+You can use ``hg log --graph --hidden`` from the command line
@@ -234,4 +213,3 @@
-
--- a/docs/evolve-good-practice.rst Thu Aug 23 18:09:45 2012 +0200
+++ b/docs/evolve-good-practice.rst Thu Jun 26 15:27:25 2014 +0100
@@ -1,5 +1,8 @@
+.. Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org>
+.. Logilab SA <contact@logilab.fr>
+
-----------------------------------------
-Good pratice for (early) user of evolve
+Good practice for (early) users of evolve
-----------------------------------------
Avoid unstability
@@ -13,12 +16,12 @@
Branch as much as possible
--------------------------------
-This is not MQ, you are not constrainted to linear history.
+This is not MQ; you are not constrained to linear history.
Making a branch per independent branch will help you avoid unstability
and conflict.
-Rewrite you change only
+Rewrite your changes only
------------------------------------------------
There is no descent conflict detection and handling right now.
@@ -26,10 +29,10 @@
conflicts. Communicate with your fellow developers before trying to
touch other people's work (which is a good pratice in any case).
-Using multiple branch will help you to achieve this goal.
+Using multiple branches will help you to achieve this goal.
-Prefer pushing unstability than touching other people changeset
-------------------------------------------------------------------
+Prefer pushing unstability to touching other people changesets
+--------------------------------------------------------------
If you have children changesets from other people that you don't really care
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/figures/edit-is-rewrite-step1.svg Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,509 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="773.15637"
+ height="740.48505"
+ id="svg3404"
+ version="1.1"
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="edit-is-rewrite-step1.svg">
+ <defs
+ id="defs3406">
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM"
+ style="overflow:visible">
+ <path
+ id="path6393"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotL"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotL"
+ style="overflow:visible">
+ <path
+ id="path6390"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.8,0,0,0.8,5.92,0.8)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Mstart"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Mstart"
+ style="overflow:visible">
+ <path
+ id="path6334"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,4,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow2Mstart"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow2Mstart"
+ style="overflow:visible">
+ <path
+ id="path6352"
+ style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+ d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+ transform="scale(0.6,0.6)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lend"
+ style="overflow:visible">
+ <path
+ id="path6331"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.8,0,0,-0.8,-10,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective3411" />
+ <inkscape:perspective
+ id="perspective5699"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective5753"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective5784"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.57"
+ inkscape:cx="215.04832"
+ inkscape:cy="422.53048"
+ inkscape:document-units="px"
+ showgrid="false"
+ inkscape:snap-global="true"
+ inkscape:window-width="1280"
+ inkscape:window-height="776"
+ inkscape:window-x="0"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="g6029"
+ fit-margin-top="5"
+ fit-margin-right="5"
+ fit-margin-bottom="5"
+ fit-margin-left="5">
+ <inkscape:grid
+ type="xygrid"
+ id="grid6315"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ originx="5.0135572px"
+ originy="4.9994442px" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata3409">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="babar"
+ transform="translate(12.275017,-145.05915)">
+ <flowRoot
+ xml:space="preserve"
+ id="flowRoot5626"
+ style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"><flowRegion
+ id="flowRegion5628"><rect
+ id="rect5630"
+ width="120.20815"
+ height="52.527931"
+ x="153.54318"
+ y="706.89001"
+ style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" /></flowRegion><flowPara
+ id="flowPara5636" /></flowRoot> <flowRoot
+ xml:space="preserve"
+ id="flowRoot5653"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><flowRegion
+ id="flowRegion5655"><rect
+ id="rect5657"
+ width="145"
+ height="49.285713"
+ x="565.71429"
+ y="683.07648" /></flowRegion><flowPara
+ id="flowPara5659" /></flowRoot> <g
+ id="g10759"
+ transform="translate(582.45614,-14.035088)">
+ <g
+ transform="translate(-422.06809,-8.1395349)"
+ id="g6029">
+ <rect
+ style="fill:#ffffff;stroke:#000000;stroke-width:4.09652519;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect3414"
+ width="291.61774"
+ height="107.33205"
+ x="68.11969"
+ y="793.33905" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Bitstream Vera Sans"
+ x="75.714279"
+ y="835.2193"
+ id="text5643"><tspan
+ sodipodi:role="line"
+ id="tspan5645"
+ x="75.714279"
+ y="835.2193"
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">";<tspan
+ style="fill:#008000;stroke:#008000"
+ id="tspan5889">Alice</tspan>;Babar"</tspan><tspan
+ sodipodi:role="line"
+ x="75.714279"
+ y="885.2193"
+ id="tspan5649"
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">⟶ <tspan
+ id="tspan6297"
+ style="fill:#c8ab37;stroke:#c8ab37">19b08111</tspan></tspan></text>
+ </g>
+ <g
+ transform="translate(-602.95683,-59.767404)"
+ id="g6023">
+ <rect
+ style="fill:#ffffff;stroke:#000000;stroke-width:6.09169483;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect3414-7"
+ width="657.06445"
+ height="105.33688"
+ x="66.285065"
+ y="639.61066" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Bitstream Vera Sans"
+ x="72.882072"
+ y="680.49335"
+ id="text5643-6"><tspan
+ sodipodi:role="line"
+ id="tspan5645-5"
+ x="72.882072"
+ y="680.49335"
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">"<tspan
+ id="tspan6203"
+ style="fill:#c8c4b7;stroke:#c8c4b7;stroke-opacity:1">19b08111</tspan>;<tspan
+ style="fill:#008000;stroke:#008000"
+ id="tspan5885">Alice</tspan>;Babar<tspan
+ id="tspan6287"
+ style="fill:#ff0000;stroke:#ff0000">,Celeste</tspan>"</tspan><tspan
+ sodipodi:role="line"
+ x="72.882072"
+ y="730.49335"
+ id="tspan5649-6"
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">⟶ <tspan
+ id="tspan6035"
+ style="stroke:#009400;stroke-opacity:1"><tspan
+ id="tspan6039"
+ style="stroke:#00b500;stroke-opacity:1"><tspan
+ id="tspan6043"
+ style="stroke:#00ae00;stroke-opacity:1"><tspan
+ id="tspan6045"
+ style="stroke:#00ad00;stroke-opacity:1"><tspan
+ id="tspan6047"
+ style="stroke:#00ac00;stroke-opacity:1"><tspan
+ id="tspan6051"
+ style="stroke:#00aa00;stroke-opacity:1"><tspan
+ id="tspan6053"
+ style="stroke:#00a800;stroke-opacity:1"><tspan
+ id="tspan6055"
+ style="stroke:#00a600;stroke-opacity:1"><tspan
+ id="tspan6057"
+ style="stroke:#00a400;stroke-opacity:1"><tspan
+ id="tspan6059"
+ style="stroke:#00a100;stroke-opacity:1"><tspan
+ id="tspan6061"
+ style="stroke:#009f00;stroke-opacity:1"><tspan
+ id="tspan6063"
+ style="stroke:#009d00;stroke-opacity:1"><tspan
+ id="tspan6065"
+ style="stroke:#009900;stroke-opacity:1"><tspan
+ id="tspan6067"
+ style="stroke:#009800;stroke-opacity:1"><tspan
+ id="tspan6069"
+ style="stroke:#009700;stroke-opacity:1"><tspan
+ id="tspan6071"
+ style="stroke:#009800;stroke-opacity:1"><tspan
+ id="tspan6073"
+ style="stroke:#009900;stroke-opacity:1"><tspan
+ id="tspan6077"
+ style="stroke:#009c00;stroke-opacity:1"><tspan
+ id="tspan6079"
+ style="stroke:#009d00;stroke-opacity:1"><tspan
+ id="tspan6081"
+ style="stroke:#009e00;stroke-opacity:1"><tspan
+ id="tspan6083"
+ style="stroke:#009f00;stroke-opacity:1"><tspan
+ id="tspan6085"
+ style="stroke:#00a100;stroke-opacity:1"><tspan
+ id="tspan6087"
+ style="stroke:#00a200;stroke-opacity:1"><tspan
+ id="tspan6089"
+ style="stroke:#00a500;stroke-opacity:1"><tspan
+ id="tspan6091"
+ style="stroke:#00a600;stroke-opacity:1"><tspan
+ id="tspan6093"
+ style="stroke:#00a500;stroke-opacity:1"><tspan
+ id="tspan6095"
+ style="stroke:#00a200;stroke-opacity:1"><tspan
+ id="tspan6097"
+ style="stroke:#00a100;stroke-opacity:1"><tspan
+ id="tspan6099"
+ style="stroke:#009f00;stroke-opacity:1"><tspan
+ id="tspan6101"
+ style="stroke:#009c00;stroke-opacity:1"><tspan
+ id="tspan6103"
+ style="stroke:#009700;stroke-opacity:1"><tspan
+ id="tspan6105"
+ style="stroke:#009200;stroke-opacity:1"><tspan
+ id="tspan6107"
+ style="stroke:#008b00;stroke-opacity:1"><tspan
+ id="tspan6109"
+ style="stroke:#008500;stroke-opacity:1"><tspan
+ id="tspan6111"
+ style="stroke:#007c00;stroke-opacity:1"><tspan
+ id="tspan6113"
+ style="stroke:#007500;stroke-opacity:1"><tspan
+ id="tspan6115"
+ style="stroke:#006b00;stroke-opacity:1"><tspan
+ id="tspan6117"
+ style="stroke:#006100;stroke-opacity:1"><tspan
+ id="tspan6119"
+ style="stroke:#005800;stroke-opacity:1"><tspan
+ id="tspan6121"
+ style="stroke:#004d00;stroke-opacity:1"><tspan
+ id="tspan6123"
+ style="stroke:#004500;stroke-opacity:1"><tspan
+ id="tspan6125"
+ style="stroke:#003b00;stroke-opacity:1"><tspan
+ id="tspan6127"
+ style="stroke:#003300;stroke-opacity:1"><tspan
+ id="tspan6129"
+ style="stroke:#002900;stroke-opacity:1"><tspan
+ id="tspan6131"
+ style="stroke:#002200;stroke-opacity:1"><tspan
+ id="tspan6133"
+ style="stroke:#001900;stroke-opacity:1"><tspan
+ id="tspan6135"
+ style="stroke:#001300;stroke-opacity:1"><tspan
+ id="tspan6137"
+ style="stroke:#000b00;stroke-opacity:1"><tspan
+ id="tspan6139"
+ style="stroke:#000700;stroke-opacity:1"><tspan
+ id="tspan6141"
+ style="stroke:#000000;stroke-opacity:1"><tspan
+ id="tspan6145"
+ style="stroke:#d00000;stroke-opacity:1"><tspan
+ id="tspan6147"
+ style="stroke:#d10000;stroke-opacity:1"><tspan
+ id="tspan6149"
+ style="stroke:#d30000;stroke-opacity:1"><tspan
+ id="tspan6151"
+ style="stroke:#d80000;stroke-opacity:1"><tspan
+ id="tspan6153"
+ style="stroke:#db0000;stroke-opacity:1"><tspan
+ id="tspan6155"
+ style="stroke:#e10000;stroke-opacity:1"><tspan
+ id="tspan6157"
+ style="stroke:#e40000;stroke-opacity:1"><tspan
+ id="tspan6159"
+ style="stroke:#eb0000;stroke-opacity:1"><tspan
+ id="tspan6161"
+ style="stroke:#ef0000;stroke-opacity:1"><tspan
+ id="tspan6163"
+ style="stroke:#f50000;stroke-opacity:1"><tspan
+ id="tspan6165"
+ style="stroke:#f90000;stroke-opacity:1"><tspan
+ id="tspan6167"
+ style="stroke:#fd0000;stroke-opacity:1"><tspan
+ id="tspan6169"
+ style="stroke:#ff0000;stroke-opacity:1"><tspan
+ id="tspan6185"
+ style="fill:#010000;fill-opacity:1"><tspan
+ id="tspan6187"
+ style="fill:#4c0000;fill-opacity:1"><tspan
+ id="tspan6189"
+ style="fill:#810000;fill-opacity:1"><tspan
+ id="tspan6191"
+ style="fill:#c70000;fill-opacity:1"><tspan
+ id="tspan6193"
+ style="fill:#ee0000;fill-opacity:1"><tspan
+ id="tspan6195"
+ style="fill:#ff0000;fill-opacity:1"><tspan
+ id="tspan6279"
+ style="fill:#c8ab37"><tspan
+ id="tspan6281"
+ style="stroke:#c8ab37">925d8319 </tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></text>
+ </g>
+ <g
+ transform="translate(-582.55815,-32.55814)"
+ id="g6009">
+ <rect
+ style="fill:#ffffff;stroke:#000000;stroke-width:5.109797;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect3414-7-0"
+ width="458.04636"
+ height="106.31878"
+ x="145.39543"
+ y="199.2028" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Bitstream Vera Sans"
+ x="152.48338"
+ y="240.57646"
+ id="text5643-6-0"><tspan
+ sodipodi:role="line"
+ x="152.48338"
+ y="240.57646"
+ id="tspan5649-6-7"
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">"<tspan
+ id="tspan6305"
+ style="fill:#c8c4b7;stroke:#c8c4b7">6fcdd7fe</tspan>;<tspan
+ style="fill:#008000;stroke:#008000"
+ id="tspan5877">Bob</tspan>;Babar"</tspan><tspan
+ sodipodi:role="line"
+ x="152.48338"
+ y="290.57648"
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="tspan5823"><tspan
+ id="tspan6309"
+ style="fill:#c8ab37;stroke:#c8ab37">⟶ebc2b5a1 </tspan></tspan><tspan
+ sodipodi:role="line"
+ x="152.48338"
+ y="340.57648"
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="tspan5825" /></text>
+ </g>
+ <g
+ transform="translate(-574.4186,-84.34382)"
+ id="g6016">
+ <rect
+ style="fill:#ffffff;stroke:#000000;stroke-width:6.52355862;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect3414-7-0-7"
+ width="756.63257"
+ height="104.90502"
+ x="-12.03722"
+ y="458.04919" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Bitstream Vera Sans"
+ x="-5.6561542"
+ y="498.71597"
+ id="text5643-6-0-7"><tspan
+ sodipodi:role="line"
+ x="-5.6561542"
+ y="498.71597"
+ id="tspan5649-6-7-5"
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">"<tspan
+ id="tspan6289"
+ style="fill:#c8c4b7;stroke:#c8c4b7">925d8319</tspan>;<tspan
+ style="fill:#008000;stroke:#008000"
+ id="tspan5881">Alice</tspan>;Babar,Celeste<tspan
+ id="tspan6303"
+ style="fill:#ff0000;stroke:#ff0000">,flore</tspan>"</tspan><tspan
+ sodipodi:role="line"
+ x="-5.6561542"
+ y="548.71594"
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="tspan5809">⟶ <tspan
+ id="tspan6299"
+ style="fill:#c8ab37;stroke:#c8ab37">6fcdd7fe </tspan></tspan><tspan
+ sodipodi:role="line"
+ x="-5.6561542"
+ y="598.71594"
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="tspan5811" /></text>
+ </g>
+ <path
+ inkscape:connection-start="#g6016"
+ inkscape:connection-end="#g6009"
+ inkscape:connector-type="polyline"
+ id="path6317"
+ d="m -208.13954,373.70537 0,-100.74193"
+ style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#DotM);marker-end:none"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connection-end="#g6023"
+ inkscape:connection-start="#g6029"
+ inkscape:connector-type="polyline"
+ id="path6321"
+ d="m -208.13953,785.19952 -1e-5,-100.01938"
+ style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2.79999995;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#DotM);marker-end:none"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connection-end="#g6023"
+ inkscape:connection-start="#g6016"
+ inkscape:connector-type="polyline"
+ id="path6323"
+ d="m -208.13954,478.6104 0,101.23285"
+ style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-mid:none;marker-end:url(#DotM)"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ </g>
+ </g>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/figures/edit-is-rewrite-step2.svg Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,832 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="1597.0645"
+ height="768.49182"
+ id="svg3404"
+ version="1.1"
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="edit-is-rewrite-step2.svg">
+ <defs
+ id="defs3406">
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM"
+ style="overflow:visible">
+ <path
+ id="path6393"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotL"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotL"
+ style="overflow:visible">
+ <path
+ id="path6390"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.8,0,0,0.8,5.92,0.8)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Mstart"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Mstart"
+ style="overflow:visible">
+ <path
+ id="path6334"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,4,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow2Mstart"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow2Mstart"
+ style="overflow:visible">
+ <path
+ id="path6352"
+ style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+ d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+ transform="scale(0.6,0.6)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lend"
+ style="overflow:visible">
+ <path
+ id="path6331"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.8,0,0,-0.8,-10,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective3411" />
+ <inkscape:perspective
+ id="perspective5699"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective5753"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective5784"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective11514"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-8"
+ style="overflow:visible">
+ <path
+ id="path6393-2"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker11520"
+ style="overflow:visible">
+ <path
+ id="path11522"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.57"
+ inkscape:cx="1091.46"
+ inkscape:cy="493.26469"
+ inkscape:document-units="px"
+ showgrid="false"
+ inkscape:snap-global="true"
+ inkscape:window-width="1280"
+ inkscape:window-height="776"
+ inkscape:window-x="0"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="layer4"
+ fit-margin-top="5"
+ fit-margin-right="5"
+ fit-margin-bottom="5"
+ fit-margin-left="5">
+ <inkscape:grid
+ type="xygrid"
+ id="grid6315"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ originx="424.40857px"
+ originy="4.9994042px" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata3409">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer4"
+ inkscape:label="babar"
+ transform="translate(888.68669,-124.06992)">
+ <flowRoot
+ xml:space="preserve"
+ id="flowRoot5626"
+ style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"><flowRegion
+ id="flowRegion5628"><rect
+ id="rect5630"
+ width="120.20815"
+ height="52.527931"
+ x="153.54318"
+ y="706.89001"
+ style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" /></flowRegion><flowPara
+ id="flowPara5636" /></flowRoot> <flowRoot
+ xml:space="preserve"
+ id="flowRoot5653"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"><flowRegion
+ id="flowRegion5655"><rect
+ id="rect5657"
+ width="145"
+ height="49.285713"
+ x="565.71429"
+ y="683.07648" /></flowRegion><flowPara
+ id="flowPara5659" /></flowRoot> <g
+ id="g6029"
+ transform="translate(-296.62861,-15.157079)">
+ <rect
+ y="793.33905"
+ x="68.11969"
+ height="107.33205"
+ width="291.61774"
+ id="rect3414"
+ style="fill:#ffffff;stroke:#000000;stroke-width:4.09652519000000037;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <text
+ id="text5643"
+ y="835.2193"
+ x="75.714279"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ y="835.2193"
+ x="75.714279"
+ id="tspan5645"
+ sodipodi:role="line">";<tspan
+ style="fill:#008000;stroke:#008000"
+ id="tspan12068">Alice</tspan>;Babar"</tspan><tspan
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="tspan5649"
+ y="885.2193"
+ x="75.714279"
+ sodipodi:role="line">⟶ <tspan
+ style="fill:#c8ab37;stroke:#c8ab37"
+ id="tspan6297">19b08111</tspan></tspan></text>
+ </g>
+ <g
+ id="g6023"
+ transform="translate(-897.69367,-93.100738)"
+ style="opacity:0.5">
+ <rect
+ y="639.61066"
+ x="66.285065"
+ height="105.33688"
+ width="657.06445"
+ id="rect3414-7"
+ style="fill:#ffffff;stroke:#000000;stroke-width:5;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:20, 10;stroke-dashoffset:0" />
+ <text
+ id="text5643-6"
+ y="680.49335"
+ x="72.882072"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ y="680.49335"
+ x="72.882072"
+ id="tspan5645-5"
+ sodipodi:role="line">"<tspan
+ style="fill:#c8c4b7;stroke:#c8c4b7;stroke-opacity:1"
+ id="tspan6203">19b08111</tspan>;<tspan
+ style="fill:#008000;stroke:#008000"
+ id="tspan12072">Alice</tspan>;Babar<tspan
+ style="fill:#ff0000;stroke:#ff0000"
+ id="tspan6287">,Celeste</tspan>"</tspan><tspan
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="tspan5649-6"
+ y="730.49335"
+ x="72.882072"
+ sodipodi:role="line">⟶ <tspan
+ style="stroke:#009400;stroke-opacity:1"
+ id="tspan6035"><tspan
+ style="stroke:#00b500;stroke-opacity:1"
+ id="tspan6039"><tspan
+ style="stroke:#00ae00;stroke-opacity:1"
+ id="tspan6043"><tspan
+ style="stroke:#00ad00;stroke-opacity:1"
+ id="tspan6045"><tspan
+ style="stroke:#00ac00;stroke-opacity:1"
+ id="tspan6047"><tspan
+ style="stroke:#00aa00;stroke-opacity:1"
+ id="tspan6051"><tspan
+ style="stroke:#00a800;stroke-opacity:1"
+ id="tspan6053"><tspan
+ style="stroke:#00a600;stroke-opacity:1"
+ id="tspan6055"><tspan
+ style="stroke:#00a400;stroke-opacity:1"
+ id="tspan6057"><tspan
+ style="stroke:#00a100;stroke-opacity:1"
+ id="tspan6059"><tspan
+ style="stroke:#009f00;stroke-opacity:1"
+ id="tspan6061"><tspan
+ style="stroke:#009d00;stroke-opacity:1"
+ id="tspan6063"><tspan
+ style="stroke:#009900;stroke-opacity:1"
+ id="tspan6065"><tspan
+ style="stroke:#009800;stroke-opacity:1"
+ id="tspan6067"><tspan
+ style="stroke:#009700;stroke-opacity:1"
+ id="tspan6069"><tspan
+ style="stroke:#009800;stroke-opacity:1"
+ id="tspan6071"><tspan
+ style="stroke:#009900;stroke-opacity:1"
+ id="tspan6073"><tspan
+ style="stroke:#009c00;stroke-opacity:1"
+ id="tspan6077"><tspan
+ style="stroke:#009d00;stroke-opacity:1"
+ id="tspan6079"><tspan
+ style="stroke:#009e00;stroke-opacity:1"
+ id="tspan6081"><tspan
+ style="stroke:#009f00;stroke-opacity:1"
+ id="tspan6083"><tspan
+ style="stroke:#00a100;stroke-opacity:1"
+ id="tspan6085"><tspan
+ style="stroke:#00a200;stroke-opacity:1"
+ id="tspan6087"><tspan
+ style="stroke:#00a500;stroke-opacity:1"
+ id="tspan6089"><tspan
+ style="stroke:#00a600;stroke-opacity:1"
+ id="tspan6091"><tspan
+ style="stroke:#00a500;stroke-opacity:1"
+ id="tspan6093"><tspan
+ style="stroke:#00a200;stroke-opacity:1"
+ id="tspan6095"><tspan
+ style="stroke:#00a100;stroke-opacity:1"
+ id="tspan6097"><tspan
+ style="stroke:#009f00;stroke-opacity:1"
+ id="tspan6099"><tspan
+ style="stroke:#009c00;stroke-opacity:1"
+ id="tspan6101"><tspan
+ style="stroke:#009700;stroke-opacity:1"
+ id="tspan6103"><tspan
+ style="stroke:#009200;stroke-opacity:1"
+ id="tspan6105"><tspan
+ style="stroke:#008b00;stroke-opacity:1"
+ id="tspan6107"><tspan
+ style="stroke:#008500;stroke-opacity:1"
+ id="tspan6109"><tspan
+ style="stroke:#007c00;stroke-opacity:1"
+ id="tspan6111"><tspan
+ style="stroke:#007500;stroke-opacity:1"
+ id="tspan6113"><tspan
+ style="stroke:#006b00;stroke-opacity:1"
+ id="tspan6115"><tspan
+ style="stroke:#006100;stroke-opacity:1"
+ id="tspan6117"><tspan
+ style="stroke:#005800;stroke-opacity:1"
+ id="tspan6119"><tspan
+ style="stroke:#004d00;stroke-opacity:1"
+ id="tspan6121"><tspan
+ style="stroke:#004500;stroke-opacity:1"
+ id="tspan6123"><tspan
+ style="stroke:#003b00;stroke-opacity:1"
+ id="tspan6125"><tspan
+ style="stroke:#003300;stroke-opacity:1"
+ id="tspan6127"><tspan
+ style="stroke:#002900;stroke-opacity:1"
+ id="tspan6129"><tspan
+ style="stroke:#002200;stroke-opacity:1"
+ id="tspan6131"><tspan
+ style="stroke:#001900;stroke-opacity:1"
+ id="tspan6133"><tspan
+ style="stroke:#001300;stroke-opacity:1"
+ id="tspan6135"><tspan
+ style="stroke:#000b00;stroke-opacity:1"
+ id="tspan6137"><tspan
+ style="stroke:#000700;stroke-opacity:1"
+ id="tspan6139"><tspan
+ style="stroke:#000000;stroke-opacity:1"
+ id="tspan6141"><tspan
+ style="stroke:#d00000;stroke-opacity:1"
+ id="tspan6145"><tspan
+ style="stroke:#d10000;stroke-opacity:1"
+ id="tspan6147"><tspan
+ style="stroke:#d30000;stroke-opacity:1"
+ id="tspan6149"><tspan
+ style="stroke:#d80000;stroke-opacity:1"
+ id="tspan6151"><tspan
+ style="stroke:#db0000;stroke-opacity:1"
+ id="tspan6153"><tspan
+ style="stroke:#e10000;stroke-opacity:1"
+ id="tspan6155"><tspan
+ style="stroke:#e40000;stroke-opacity:1"
+ id="tspan6157"><tspan
+ style="stroke:#eb0000;stroke-opacity:1"
+ id="tspan6159"><tspan
+ style="stroke:#ef0000;stroke-opacity:1"
+ id="tspan6161"><tspan
+ style="stroke:#f50000;stroke-opacity:1"
+ id="tspan6163"><tspan
+ style="stroke:#f90000;stroke-opacity:1"
+ id="tspan6165"><tspan
+ style="stroke:#fd0000;stroke-opacity:1"
+ id="tspan6167"><tspan
+ style="stroke:#ff0000;stroke-opacity:1"
+ id="tspan6169"><tspan
+ style="fill:#010000;fill-opacity:1"
+ id="tspan6185"><tspan
+ style="fill:#4c0000;fill-opacity:1"
+ id="tspan6187"><tspan
+ style="fill:#810000;fill-opacity:1"
+ id="tspan6189"><tspan
+ style="fill:#c70000;fill-opacity:1"
+ id="tspan6191"><tspan
+ style="fill:#ee0000;fill-opacity:1"
+ id="tspan6193"><tspan
+ style="fill:#ff0000;fill-opacity:1"
+ id="tspan6195"><tspan
+ style="fill:#c8ab37"
+ id="tspan6279"><tspan
+ style="stroke:#c8ab37"
+ id="tspan6281">925d8319 </tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></text>
+ </g>
+ <g
+ id="g6009"
+ transform="translate(-877.29499,-65.891474)"
+ style="opacity:0.5">
+ <rect
+ y="199.2028"
+ x="145.39543"
+ height="106.31878"
+ width="458.04636"
+ id="rect3414-7-0"
+ style="fill:#ffffff;stroke:#000000;stroke-width:5;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:20, 10;stroke-dashoffset:0" />
+ <text
+ id="text5643-6-0"
+ y="240.57646"
+ x="152.48338"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="tspan5649-6-7"
+ y="240.57646"
+ x="152.48338"
+ sodipodi:role="line">"<tspan
+ style="fill:#c8c4b7;stroke:#c8c4b7"
+ id="tspan6305">6fcdd7fe</tspan>;<tspan
+ style="fill:#008000;stroke:#008000"
+ id="tspan12080">Bob</tspan>;Babar"</tspan><tspan
+ id="tspan5823"
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ y="290.57648"
+ x="152.48338"
+ sodipodi:role="line"><tspan
+ style="fill:#c8ab37;stroke:#c8ab37"
+ id="tspan6309">⟶ebc2b5a1 </tspan></tspan><tspan
+ id="tspan5825"
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ y="340.57648"
+ x="152.48338"
+ sodipodi:role="line" /></text>
+ </g>
+ <g
+ id="g6016"
+ transform="translate(-869.15544,-117.67716)"
+ style="opacity:0.5">
+ <rect
+ y="458.04919"
+ x="-12.03722"
+ height="104.90502"
+ width="756.63257"
+ id="rect3414-7-0-7"
+ style="fill:#ffffff;stroke:#000000;stroke-width:5;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:20, 10;stroke-dashoffset:0" />
+ <text
+ id="text5643-6-0-7"
+ y="498.71597"
+ x="-5.6561542"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="tspan5649-6-7-5"
+ y="498.71597"
+ x="-5.6561542"
+ sodipodi:role="line">"<tspan
+ style="fill:#c8c4b7;stroke:#c8c4b7"
+ id="tspan6289">925d8319</tspan>;<tspan
+ style="fill:#008000;stroke:#008000"
+ id="tspan12076">Alice</tspan>;Babar,Celeste<tspan
+ style="fill:#ff0000;stroke:#ff0000"
+ id="tspan6303">,flore<tspan
+ style="fill:#000000;stroke:#000000"
+ id="tspan6313">"</tspan></tspan></tspan><tspan
+ id="tspan5809"
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ y="548.71594"
+ x="-5.6561542"
+ sodipodi:role="line">⟶ <tspan
+ style="fill:#c8ab37;stroke:#c8ab37"
+ id="tspan6299">6fcdd7fe </tspan></tspan><tspan
+ id="tspan5811"
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ y="598.71594"
+ x="-5.6561542"
+ sodipodi:role="line" /></text>
+ </g>
+ <path
+ style="opacity:0.5;fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#DotM);marker-end:none"
+ d="m -502.87638,340.37203 0,-100.74192"
+ id="path6317"
+ inkscape:connector-type="polyline"
+ inkscape:connection-end="#g6009"
+ inkscape:connection-start="#g6016"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <path
+ style="opacity:0.5;fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2.79999995000000013;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#DotM);marker-end:none"
+ d="M -179.61512,778.18197 -407.76284,651.8468"
+ id="path6321"
+ inkscape:connector-type="polyline"
+ inkscape:connection-start="#g6029"
+ inkscape:connection-end="#g6023"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <path
+ style="opacity:0.5;fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-mid:none;marker-end:url(#DotM)"
+ d="m -502.87638,445.27706 0,101.23286"
+ id="path6323"
+ inkscape:connector-type="polyline"
+ inkscape:connection-end="#g6023"
+ inkscape:connection-start="#g6016"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <g
+ id="g6023-5"
+ transform="translate(-72.254198,-94.854246)">
+ <rect
+ y="639.61066"
+ x="66.285065"
+ height="105.33688"
+ width="657.06445"
+ id="rect3414-7-5"
+ style="fill:#ffffff;stroke:#000000;stroke-width:5;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <text
+ id="text5643-6-3"
+ y="680.49335"
+ x="72.882072"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ y="680.49335"
+ x="72.882072"
+ id="tspan5645-5-0"
+ sodipodi:role="line">"<tspan
+ style="fill:#c8c4b7;stroke:#c8c4b7;stroke-opacity:1"
+ id="tspan6203-2">19b08111</tspan>;<tspan
+ style="fill:#ff0000;stroke:#ff0000"
+ id="tspan12040">Bob</tspan>;Babar,Celeste"</tspan><tspan
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="tspan5649-6-70"
+ y="730.49335"
+ x="72.882072"
+ sodipodi:role="line">⟶ <tspan
+ style="stroke:#009400;stroke-opacity:1"
+ id="tspan6035-4"><tspan
+ style="stroke:#00b500;stroke-opacity:1"
+ id="tspan6039-3"><tspan
+ style="stroke:#00ae00;stroke-opacity:1"
+ id="tspan6043-2"><tspan
+ style="stroke:#00ad00;stroke-opacity:1"
+ id="tspan6045-5"><tspan
+ style="stroke:#00ac00;stroke-opacity:1"
+ id="tspan6047-2"><tspan
+ style="stroke:#00aa00;stroke-opacity:1"
+ id="tspan6051-8"><tspan
+ style="stroke:#00a800;stroke-opacity:1"
+ id="tspan6053-9"><tspan
+ style="stroke:#00a600;stroke-opacity:1"
+ id="tspan6055-1"><tspan
+ style="stroke:#00a400;stroke-opacity:1"
+ id="tspan6057-7"><tspan
+ style="stroke:#00a100;stroke-opacity:1"
+ id="tspan6059-2"><tspan
+ style="stroke:#009f00;stroke-opacity:1"
+ id="tspan6061-8"><tspan
+ style="stroke:#009d00;stroke-opacity:1"
+ id="tspan6063-7"><tspan
+ style="stroke:#009900;stroke-opacity:1"
+ id="tspan6065-4"><tspan
+ style="stroke:#009800;stroke-opacity:1"
+ id="tspan6067-1"><tspan
+ style="stroke:#009700;stroke-opacity:1"
+ id="tspan6069-4"><tspan
+ style="stroke:#009800;stroke-opacity:1"
+ id="tspan6071-7"><tspan
+ style="stroke:#009900;stroke-opacity:1"
+ id="tspan6073-8"><tspan
+ style="stroke:#009c00;stroke-opacity:1"
+ id="tspan6077-6"><tspan
+ style="stroke:#009d00;stroke-opacity:1"
+ id="tspan6079-8"><tspan
+ style="stroke:#009e00;stroke-opacity:1"
+ id="tspan6081-8"><tspan
+ style="stroke:#009f00;stroke-opacity:1"
+ id="tspan6083-3"><tspan
+ style="stroke:#00a100;stroke-opacity:1"
+ id="tspan6085-6"><tspan
+ style="stroke:#00a200;stroke-opacity:1"
+ id="tspan6087-0"><tspan
+ style="stroke:#00a500;stroke-opacity:1"
+ id="tspan6089-0"><tspan
+ style="stroke:#00a600;stroke-opacity:1"
+ id="tspan6091-3"><tspan
+ style="stroke:#00a500;stroke-opacity:1"
+ id="tspan6093-6"><tspan
+ style="stroke:#00a200;stroke-opacity:1"
+ id="tspan6095-1"><tspan
+ style="stroke:#00a100;stroke-opacity:1"
+ id="tspan6097-5"><tspan
+ style="stroke:#009f00;stroke-opacity:1"
+ id="tspan6099-8"><tspan
+ style="stroke:#009c00;stroke-opacity:1"
+ id="tspan6101-8"><tspan
+ style="stroke:#009700;stroke-opacity:1"
+ id="tspan6103-6"><tspan
+ style="stroke:#009200;stroke-opacity:1"
+ id="tspan6105-2"><tspan
+ style="stroke:#008b00;stroke-opacity:1"
+ id="tspan6107-1"><tspan
+ style="stroke:#008500;stroke-opacity:1"
+ id="tspan6109-0"><tspan
+ style="stroke:#007c00;stroke-opacity:1"
+ id="tspan6111-9"><tspan
+ style="stroke:#007500;stroke-opacity:1"
+ id="tspan6113-5"><tspan
+ style="stroke:#006b00;stroke-opacity:1"
+ id="tspan6115-0"><tspan
+ style="stroke:#006100;stroke-opacity:1"
+ id="tspan6117-9"><tspan
+ style="stroke:#005800;stroke-opacity:1"
+ id="tspan6119-7"><tspan
+ style="stroke:#004d00;stroke-opacity:1"
+ id="tspan6121-7"><tspan
+ style="stroke:#004500;stroke-opacity:1"
+ id="tspan6123-3"><tspan
+ style="stroke:#003b00;stroke-opacity:1"
+ id="tspan6125-5"><tspan
+ style="stroke:#003300;stroke-opacity:1"
+ id="tspan6127-6"><tspan
+ style="stroke:#002900;stroke-opacity:1"
+ id="tspan6129-8"><tspan
+ style="stroke:#002200;stroke-opacity:1"
+ id="tspan6131-6"><tspan
+ style="stroke:#001900;stroke-opacity:1"
+ id="tspan6133-2"><tspan
+ style="stroke:#001300;stroke-opacity:1"
+ id="tspan6135-7"><tspan
+ style="stroke:#000b00;stroke-opacity:1"
+ id="tspan6137-6"><tspan
+ style="stroke:#000700;stroke-opacity:1"
+ id="tspan6139-8"><tspan
+ style="stroke:#000000;stroke-opacity:1"
+ id="tspan6141-5"><tspan
+ style="stroke:#d00000;stroke-opacity:1"
+ id="tspan6145-5"><tspan
+ style="stroke:#d10000;stroke-opacity:1"
+ id="tspan6147-1"><tspan
+ style="stroke:#d30000;stroke-opacity:1"
+ id="tspan6149-3"><tspan
+ style="stroke:#d80000;stroke-opacity:1"
+ id="tspan6151-7"><tspan
+ style="stroke:#db0000;stroke-opacity:1"
+ id="tspan6153-2"><tspan
+ style="stroke:#e10000;stroke-opacity:1"
+ id="tspan6155-6"><tspan
+ style="stroke:#e40000;stroke-opacity:1"
+ id="tspan6157-3"><tspan
+ style="stroke:#eb0000;stroke-opacity:1"
+ id="tspan6159-5"><tspan
+ style="stroke:#ef0000;stroke-opacity:1"
+ id="tspan6161-3"><tspan
+ style="stroke:#f50000;stroke-opacity:1"
+ id="tspan6163-3"><tspan
+ style="stroke:#f90000;stroke-opacity:1"
+ id="tspan6165-5"><tspan
+ style="stroke:#fd0000;stroke-opacity:1"
+ id="tspan6167-1"><tspan
+ style="stroke:#ff0000;stroke-opacity:1"
+ id="tspan6169-8"><tspan
+ style="fill:#010000;fill-opacity:1"
+ id="tspan6185-8"><tspan
+ style="fill:#4c0000;fill-opacity:1"
+ id="tspan6187-3"><tspan
+ style="fill:#810000;fill-opacity:1"
+ id="tspan6189-7"><tspan
+ style="fill:#c70000;fill-opacity:1"
+ id="tspan6191-5"><tspan
+ style="fill:#ee0000;fill-opacity:1"
+ id="tspan6193-3"><tspan
+ style="fill:#ff0000;fill-opacity:1"
+ id="tspan6195-6"><tspan
+ style="fill:#c8ab37"
+ id="tspan6279-2"><tspan
+ style="stroke:#c8ab37"
+ id="tspan6281-0">1a25964c </tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></tspan></text>
+ </g>
+ <g
+ id="g6009-2"
+ transform="matrix(1.0149773,0,0,1,-61.013248,-67.644986)">
+ <rect
+ y="199.28004"
+ x="136.82903"
+ height="106.1643"
+ width="487.27863"
+ id="rect3414-7-0-9"
+ style="fill:#ffffff;stroke:#000000;stroke-width:5.15333318999999968;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <text
+ id="text5643-6-0-8"
+ y="240.57646"
+ x="152.48338"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="tspan5649-6-7-0"
+ y="240.57646"
+ x="152.48338"
+ sodipodi:role="line">"<tspan
+ style="fill:#ff0000;stroke:#ff0000"
+ id="tspan6305-8">6d9e1549</tspan>;<tspan
+ style="fill:#008000;stroke:#008000"
+ id="tspan12088">Bob</tspan>;Babar"</tspan><tspan
+ id="tspan5823-0"
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ y="290.57648"
+ x="152.48338"
+ sodipodi:role="line"><tspan
+ style="fill:#c8ab37;stroke:#c8ab37"
+ id="tspan6309-7"><tspan
+ style="fill:#000000;stroke:#000000"
+ id="tspan12060">⟶<tspan
+ style="fill:#c8ab37"
+ id="tspan12064"><tspan
+ style="stroke:#c8ab37"
+ id="tspan12066">dda72e36 </tspan></tspan></tspan></tspan></tspan><tspan
+ id="tspan5825-4"
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ y="340.57648"
+ x="152.48338"
+ sodipodi:role="line" /></text>
+ </g>
+ <g
+ id="g6016-0"
+ transform="translate(-43.715968,-119.43067)">
+ <rect
+ y="458.04919"
+ x="-12.03722"
+ height="104.90502"
+ width="756.63257"
+ id="rect3414-7-0-7-4"
+ style="fill:#ffffff;stroke:#000000;stroke-width:5;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <text
+ id="text5643-6-0-7-1"
+ y="498.71597"
+ x="-5.6561542"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="tspan5649-6-7-5-4"
+ y="498.71597"
+ x="-5.6561542"
+ sodipodi:role="line">"<tspan
+ style="fill:#c8c4b7;stroke:#c8c4b7"
+ id="tspan12056">1a25964c</tspan>;<tspan
+ style="fill:#008000;stroke:#008000"
+ id="tspan12084">Alice</tspan>;Babar,Celeste,<tspan
+ style="fill:#ff0000;stroke:#ff0000"
+ id="tspan12050">F</tspan>lore"</tspan><tspan
+ id="tspan5809-3"
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ y="548.71594"
+ x="-5.6561542"
+ sodipodi:role="line">⟶ <tspan
+ style="fill:#c8ab37;stroke:#c8ab37"
+ id="tspan6299-4">6d9e1549 </tspan></tspan><tspan
+ id="tspan5811-3"
+ style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ y="598.71594"
+ x="-5.6561542"
+ sodipodi:role="line" /></text>
+ </g>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#DotM);marker-end:none"
+ d="m 323.22154,338.61852 1.26559,-100.81916"
+ id="path6317-8"
+ inkscape:connector-type="polyline"
+ inkscape:connection-end="#g6009-2"
+ inkscape:connection-start="#g6016-0"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-mid:none;marker-end:url(#DotM)"
+ d="m 322.5631,443.52355 -1e-5,101.23286"
+ id="path6323-8"
+ inkscape:connector-type="polyline"
+ inkscape:connection-start="#g6016-0"
+ inkscape:connection-end="#g6023-5"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#marker11520)"
+ d="M 231.51159,650.09329 10.076033,778.18197"
+ id="path11833"
+ inkscape:connector-type="polyline"
+ inkscape:connection-start="#g6023-5"
+ inkscape:connection-end="#g6029"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ </g>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/figures/explain-troubles-concurrent-10-solution.svg Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,929 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="1290.3188"
+ height="561.80957"
+ id="svg12094"
+ version="1.1"
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="explain-troubles-concurrent-10-solution.svg">
+ <defs
+ id="defs12096">
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="EmptyDiamondMend"
+ style="overflow:visible">
+ <path
+ id="path4197"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMstart"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="EmptyDiamondMstart"
+ style="overflow:visible">
+ <path
+ id="path4188"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,2.6,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM"
+ style="overflow:visible">
+ <path
+ id="path6393"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotS"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotS"
+ style="overflow:visible">
+ <path
+ id="path6396"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.2,0,0,0.2,1.48,0.2)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective12102" />
+ <pattern
+ patternUnits="userSpaceOnUse"
+ width="165"
+ height="162.14285"
+ patternTransform="matrix(0.60606061,0,0,0.61674011,-218.21429,419.14788)"
+ id="pattern12110">
+ <rect
+ ry="78.664986"
+ y="2.4064403"
+ x="2.4064403"
+ height="157.32997"
+ width="160.18712"
+ id="rect12108"
+ style="opacity:0.75;fill:#008000;fill-opacity:0;fill-rule:nonzero;stroke:#008000;stroke-width:4.81288052;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ </pattern>
+ <inkscape:perspective
+ id="perspective12641"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective12674"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective12705"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective12705-5"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective12811"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective12838"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective12869"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective12869-3"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective8199"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective8230"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-1"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path6393-0"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker3407"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path3409"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker3411"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path3413"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker3415"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path3417"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="EmptyDiamondMend-9"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path4197-6"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker3421"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path3423"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-15"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path6393-08"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker3824"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path3826"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker3828"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path3830"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker3832"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path3834"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="EmptyDiamondMend-7"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path4197-67"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker3838"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path3840"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+ </marker>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.7"
+ inkscape:cx="746.41279"
+ inkscape:cy="248.41683"
+ inkscape:document-units="px"
+ inkscape:current-layer="g3367-2"
+ showgrid="false"
+ inkscape:window-width="1215"
+ inkscape:window-height="776"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ fit-margin-left="5"
+ fit-margin-top="5"
+ fit-margin-right="5"
+ fit-margin-bottom="5" />
+ <metadata
+ id="metadata12099">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(1002.1836,-116.82843)">
+ <flowRoot
+ transform="translate(-214.28571,111.42857)"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ id="flowRoot12902"
+ xml:space="preserve"><flowRegion
+ id="flowRegion12904"><rect
+ y="320.93362"
+ x="-924.28571"
+ height="435.71429"
+ width="301.42856"
+ id="rect12906" /></flowRegion><flowPara
+ id="flowPara12908" /></flowRoot> <g
+ id="g3367">
+ <g
+ style="opacity:0.5"
+ id="g8425">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-750.72428,151.88146)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-822.54358"
+ y="362.2431"
+ id="text12629-9-3-1"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0"
+ x="-822.54358"
+ y="362.2431">B</tspan></text>
+ </g>
+ <g
+ id="g10287">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-9"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-750.72428,288.54815)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-821.49023"
+ y="498.90979"
+ id="text12629-9-3-1-8"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-7"
+ x="-821.49023"
+ y="498.90979">A</tspan></text>
+ </g>
+ <g
+ transform="translate(-10.776028,0)"
+ id="g12957">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-6"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,425.21479)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-810.71423"
+ y="635.57648"
+ id="text12629-9-3-1-83"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-5"
+ x="-810.71423"
+ y="635.57648">Z</tspan></text>
+ </g>
+ <path
+ inkscape:connector-type="polyline"
+ id="path12950"
+ d="m -808.27602,393.39505 0,42.40522"
+ style="opacity:0.5;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connection-end="#g12957"
+ inkscape:connector-type="polyline"
+ id="path12962"
+ d="m -808.27602,532.73368 0,39.73323"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <g
+ style="fill:#0000ff;stroke:#0000ff"
+ id="g8286">
+ <path
+ sodipodi:type="arc"
+ style="fill:#0000ff;fill-opacity:0;fill-rule:evenodd;stroke:#0000ff;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-5"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-612.86713,62.419408)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#0000ff;fill-opacity:1;stroke:#0000ff;font-family:Bitstream Vera Sans"
+ x="-684.68646"
+ y="272.78107"
+ id="text12629-9-3-1-4"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-76"
+ x="-684.68646"
+ y="272.78107">B'</tspan></text>
+ </g>
+ <g
+ style="fill:#008000;stroke:#008000"
+ id="g8294">
+ <path
+ sodipodi:type="arc"
+ style="fill:#008000;fill-opacity:0;fill-rule:evenodd;stroke:#008000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-5-2"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-888.58143,62.419408)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#008000;fill-opacity:1;stroke:#008000;font-family:Bitstream Vera Sans"
+ x="-960.40076"
+ y="272.78107"
+ id="text12629-9-3-1-4-8"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-76-6"
+ x="-960.40076"
+ y="272.78107">B''</tspan></text>
+ </g>
+ <path
+ inkscape:connection-end="#g10287"
+ inkscape:connection-start="#g8286"
+ inkscape:connector-type="polyline"
+ transform="translate(-997.6235,206.6479)"
+ id="path8303"
+ d="M 301.69976,93.326264 214.85234,235.78314"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM);display:inline"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connection-end="#g10287"
+ inkscape:connection-start="#g8294"
+ inkscape:connector-type="polyline"
+ transform="translate(-997.6235,206.6479)"
+ id="path8305"
+ d="M 76.995186,93.326264 163.84261,235.78314"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM);display:inline"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connection-end="#g8425"
+ inkscape:connection-start="#g8286"
+ inkscape:connector-type="polyline"
+ transform="translate(-997.6235,206.6479)"
+ id="path8430"
+ d="M 286.10442,78.162204 230.44767,114.28051"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-start:none;marker-end:url(#EmptyDiamondMend)"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connection-end="#g8425"
+ inkscape:connection-start="#g8294"
+ inkscape:connector-type="polyline"
+ transform="translate(-997.6235,206.6479)"
+ id="path8432"
+ d="M 92.590525,78.162204 148.24727,114.28051"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-end:url(#EmptyDiamondMend)"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ id="g3367-2"
+ transform="translate(902.50523,0.6852693)">
+ <g
+ style="opacity:0.5"
+ id="g8425-2">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-64"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-750.72428,151.88146)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-822.54358"
+ y="362.2431"
+ id="text12629-9-3-1-6"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-1"
+ x="-822.54358"
+ y="362.2431">B</tspan></text>
+ </g>
+ <g
+ id="g10287-0">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-9-6"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-750.72428,288.54815)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-821.49023"
+ y="498.90979"
+ id="text12629-9-3-1-8-5"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-7-9"
+ x="-821.49023"
+ y="498.90979">A</tspan></text>
+ </g>
+ <g
+ transform="translate(-10.776028,0)"
+ id="g12957-1">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-6-6"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,425.21479)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-810.71423"
+ y="635.57648"
+ id="text12629-9-3-1-83-8"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-5-0"
+ x="-810.71423"
+ y="635.57648">Z</tspan></text>
+ </g>
+ <path
+ inkscape:connector-type="polyline"
+ id="path12950-6"
+ d="m -808.27602,393.39505 0,42.40522"
+ style="opacity:0.5;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connection-end="#g12957-1"
+ inkscape:connector-type="polyline"
+ id="path12962-4"
+ d="m -808.27602,532.73368 0,39.73323"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <g
+ style="opacity:0.5;fill:#0000ff;stroke:#0000ff"
+ id="g8286-9">
+ <path
+ sodipodi:type="arc"
+ style="fill:#0000ff;fill-opacity:0;fill-rule:evenodd;stroke:#0000ff;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-5-9"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-612.86713,62.419408)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#0000ff;fill-opacity:1;stroke:#0000ff;font-family:Bitstream Vera Sans"
+ x="-684.68646"
+ y="272.78107"
+ id="text12629-9-3-1-4-0"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-76-0"
+ x="-684.68646"
+ y="272.78107">B'</tspan></text>
+ </g>
+ <g
+ style="opacity:0.5;fill:#008000;stroke:#008000"
+ id="g8294-9">
+ <path
+ sodipodi:type="arc"
+ style="fill:#008000;fill-opacity:0;fill-rule:evenodd;stroke:#008000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-5-2-8"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-888.58143,62.419408)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#008000;fill-opacity:1;stroke:#008000;font-family:Bitstream Vera Sans"
+ x="-960.40076"
+ y="272.78107"
+ id="text12629-9-3-1-4-8-2"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-76-6-0"
+ x="-960.40076"
+ y="272.78107">B''</tspan></text>
+ </g>
+ <path
+ inkscape:connection-end="#g10287-0"
+ inkscape:connection-start="#g8286-9"
+ inkscape:connector-type="polyline"
+ transform="translate(-997.6235,206.6479)"
+ id="path8303-7"
+ d="M 301.69976,93.326264 214.85234,235.78314"
+ style="opacity:0.5;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM);display:inline"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connection-end="#g10287-0"
+ inkscape:connection-start="#g8294-9"
+ inkscape:connector-type="polyline"
+ transform="translate(-997.6235,206.6479)"
+ id="path8305-3"
+ d="M 76.995186,93.326264 163.84261,235.78314"
+ style="opacity:0.5;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM);display:inline"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connection-end="#g8425-2"
+ inkscape:connection-start="#g8286-9"
+ inkscape:connector-type="polyline"
+ transform="translate(-997.6235,206.6479)"
+ id="path8430-0"
+ d="M 286.10442,78.162204 230.44767,114.28051"
+ style="opacity:0.5;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-start:none;marker-end:url(#EmptyDiamondMend)"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connection-end="#g8425-2"
+ inkscape:connection-start="#g8294-9"
+ inkscape:connector-type="polyline"
+ transform="translate(-997.6235,206.6479)"
+ id="path8432-1"
+ d="M 92.590525,78.162204 148.24727,114.28051"
+ style="opacity:0.5;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-end:url(#EmptyDiamondMend)"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-end:url(#marker3838)"
+ d="m 1045.7143,-14.223969 -54.28573,30"
+ id="path5991"
+ inkscape:connector-curvature="0"
+ transform="translate(-1900.1287,205.96263)" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-end:url(#marker3838)"
+ d="M 1141.4286,-4.2239685 1185.7143,24.34746"
+ id="path5993"
+ inkscape:connector-curvature="0"
+ transform="translate(-1900.1287,205.96263)" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#marker3832)"
+ d="m 1068.5714,11.490317 -62.8571,88.571433 70,132.85714"
+ id="path5995"
+ inkscape:connector-curvature="0"
+ transform="translate(-1900.1287,205.96263)" />
+ </g>
+ <g
+ id="g5033">
+ <path
+ transform="matrix(0.33294398,0,0,0.48990327,-283.50522,302.96994)"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ sodipodi:ry="100"
+ sodipodi:rx="147.14285"
+ sodipodi:cy="399.50504"
+ sodipodi:cx="-172.85715"
+ id="path12627-8-4-1-3"
+ style="opacity:0.5;fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <text
+ id="text12629-9-3-1-0"
+ y="513.3316"
+ x="-355.32452"
+ style="font-size:40px;font-style:normal;font-weight:normal;opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="513.3316"
+ x="-355.32452"
+ id="tspan12631-6-9-0-8"
+ sodipodi:role="line">B</tspan></text>
+ </g>
+ <g
+ id="g5028">
+ <path
+ transform="matrix(0.33294398,0,0,0.48990327,-146.5298,215.57827)"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ sodipodi:ry="100"
+ sodipodi:rx="147.14285"
+ sodipodi:cy="399.50504"
+ sodipodi:cx="-172.85715"
+ id="path12627-8-4-1-5-1"
+ style="fill:#0000ff;fill-opacity:0;fill-rule:evenodd;stroke:#0000ff;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <text
+ id="text12629-9-3-1-4-9"
+ y="425.93994"
+ x="-218.34914"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#0000ff;fill-opacity:1;stroke:#0000ff;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="425.93994"
+ x="-218.34914"
+ id="tspan12631-6-9-0-76-8"
+ sodipodi:role="line">B'</tspan></text>
+ </g>
+ <g
+ id="g5023">
+ <path
+ transform="matrix(0.33294398,0,0,0.48990327,-422.14656,215.91205)"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ sodipodi:ry="100"
+ sodipodi:rx="147.14285"
+ sodipodi:cy="399.50504"
+ sodipodi:cx="-172.85715"
+ id="path12627-8-4-1-5-2-4"
+ style="fill:#008000;fill-opacity:0;fill-rule:evenodd;stroke:#008000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <text
+ id="text12629-9-3-1-4-8-3"
+ y="426.27371"
+ x="-493.96588"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#008000;fill-opacity:1;stroke:#008000;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="426.27371"
+ x="-493.96588"
+ id="tspan12631-6-9-0-76-6-4"
+ sodipodi:role="line">B''</tspan></text>
+ </g>
+ <g
+ id="g5018">
+ <path
+ transform="matrix(0.33294398,0,0,0.48990327,-285.48057,130.5673)"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ sodipodi:ry="100"
+ sodipodi:rx="147.14285"
+ sodipodi:cy="399.50504"
+ sodipodi:cx="-172.85715"
+ id="path12627-8-4-1-5-1-4"
+ style="fill:#0000ff;fill-opacity:0;fill-rule:evenodd;stroke:#007d7d;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <text
+ id="text12629-9-3-1-4-9-5"
+ y="340.92896"
+ x="-357.2999"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#0000ff;fill-opacity:1;stroke:#007d7d;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="340.92896"
+ x="-357.2999"
+ id="tspan12631-6-9-0-76-8-9"
+ sodipodi:role="line"
+ style="fill:#007d7d;fill-opacity:1">B*</tspan></text>
+ </g>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-end:url(#marker3838)"
+ d="m 696.38676,145.20902 55.35962,33.86937"
+ id="path5038"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="3"
+ inkscape:connection-start="#g5018"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end="#g5028"
+ inkscape:connection-end-point="d4"
+ transform="translate(-997.6235,206.6479)" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-end:url(#marker3838)"
+ d="m 613.03214,145.59088 -53.54791,33.43943"
+ id="path5040"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="3"
+ inkscape:connection-start="#g5018"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end="#g5023"
+ inkscape:connection-end-point="d4"
+ transform="translate(-997.6235,206.6479)" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-end:url(#marker3838)"
+ d="m 559.41952,231.03876 55.65269,34.94632"
+ id="path5042"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="3"
+ inkscape:connection-start="#g5023"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end="#g5033"
+ inkscape:connection-end-point="d4"
+ transform="translate(-997.6235,206.6479)" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-end:url(#marker3838)"
+ d="M 752.23638,231.00256 697.87211,265.6875"
+ id="path5044"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="3"
+ inkscape:connection-start="#g5028"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end="#g5033"
+ inkscape:connection-end-point="d4"
+ transform="translate(-997.6235,206.6479)" />
+ <g
+ transform="translate(441.1231,-152.43362)"
+ id="g5018-9">
+ <path
+ transform="matrix(0.33294398,0,0,0.48990327,-285.48057,130.5673)"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ sodipodi:ry="100"
+ sodipodi:rx="147.14285"
+ sodipodi:cy="399.50504"
+ sodipodi:cx="-172.85715"
+ id="path12627-8-4-1-5-1-4-7"
+ style="fill:#0000ff;fill-opacity:0;fill-rule:evenodd;stroke:#007d7d;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <text
+ id="text12629-9-3-1-4-9-5-1"
+ y="340.92896"
+ x="-357.2999"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#0000ff;fill-opacity:1;stroke:#007d7d;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="340.92896"
+ x="-357.2999"
+ id="tspan12631-6-9-0-76-8-9-4"
+ sodipodi:role="line"
+ style="fill:#007d7d;fill-opacity:1">B*</tspan></text>
+ </g>
+ </g>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/figures/explain-troubles-concurrent-10-sumup.svg Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,1451 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="1424.2434"
+ height="1058.7501"
+ id="svg12964"
+ version="1.1"
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="explain-troubles-concurrent-10-sumup.svg">
+ <defs
+ id="defs12966">
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Mend"
+ style="overflow:visible">
+ <path
+ id="path4078"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lend"
+ style="overflow:visible">
+ <path
+ id="path4072"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Lstart"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lstart"
+ style="overflow:visible">
+ <path
+ id="path4069"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.8,0,0,0.8,10,0)" />
+ </marker>
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective12972" />
+ <inkscape:perspective
+ id="perspective13312"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM"
+ style="overflow:visible">
+ <path
+ id="path6393"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13318"
+ style="overflow:visible">
+ <path
+ id="path13320"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective13418"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-1"
+ style="overflow:visible">
+ <path
+ id="path6393-1"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13424"
+ style="overflow:visible">
+ <path
+ id="path13426"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13428"
+ style="overflow:visible">
+ <path
+ id="path13430"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13432"
+ style="overflow:visible">
+ <path
+ id="path13434"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="EmptyDiamondMend"
+ style="overflow:visible">
+ <path
+ id="path6456"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13438"
+ style="overflow:visible">
+ <path
+ id="path13440"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective13583"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-0"
+ style="overflow:visible">
+ <path
+ id="path6393-5"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13589"
+ style="overflow:visible">
+ <path
+ id="path13591"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13593"
+ style="overflow:visible">
+ <path
+ id="path13595"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective13743"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-2"
+ style="overflow:visible">
+ <path
+ id="path6393-2"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13749"
+ style="overflow:visible">
+ <path
+ id="path13751"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13753"
+ style="overflow:visible">
+ <path
+ id="path13755"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13757"
+ style="overflow:visible">
+ <path
+ id="path13759"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="EmptyDiamondMend-3"
+ style="overflow:visible">
+ <path
+ id="path6456-4"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13763"
+ style="overflow:visible">
+ <path
+ id="path13765"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective15593"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lend-2"
+ style="overflow:visible">
+ <path
+ id="path4072-8"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective15593-5"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lend-6"
+ style="overflow:visible">
+ <path
+ id="path4072-7"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective15593-1"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lend-29"
+ style="overflow:visible">
+ <path
+ id="path4072-70"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective18500"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-4"
+ style="overflow:visible">
+ <path
+ id="path6393-20"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective18588"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-47"
+ style="overflow:visible">
+ <path
+ id="path6393-22"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker18594"
+ style="overflow:visible">
+ <path
+ id="path18596"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="EmptyDiamondMend-31"
+ style="overflow:visible">
+ <path
+ id="path4197"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective18791"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective18959"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-6"
+ style="overflow:visible">
+ <path
+ id="path6393-21"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker18965"
+ style="overflow:visible">
+ <path
+ id="path18967"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-1-4"
+ style="overflow:visible">
+ <path
+ id="path6393-3"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="EmptyDiamondMend-2"
+ style="overflow:visible">
+ <path
+ id="path4197-2"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective19288"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-44"
+ style="overflow:visible">
+ <path
+ id="path6393-9"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker19294"
+ style="overflow:visible">
+ <path
+ id="path19296"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective20729"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-8"
+ style="overflow:visible">
+ <path
+ id="path6393-7"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker20735"
+ style="overflow:visible">
+ <path
+ id="path20737"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective20952"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-42"
+ style="overflow:visible">
+ <path
+ id="path6393-0"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker20958"
+ style="overflow:visible">
+ <path
+ id="path20960"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker20962"
+ style="overflow:visible">
+ <path
+ id="path20964"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="EmptyDiamondMend-8"
+ style="overflow:visible">
+ <path
+ id="path4197-7"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective21100"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-22"
+ style="overflow:visible">
+ <path
+ id="path6393-8"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker21106"
+ style="overflow:visible">
+ <path
+ id="path21108"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker21110"
+ style="overflow:visible">
+ <path
+ id="path21112"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="EmptyDiamondMend-313"
+ style="overflow:visible">
+ <path
+ id="path4197-6"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective21316"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-3"
+ style="overflow:visible">
+ <path
+ id="path6393-80"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker21322"
+ style="overflow:visible">
+ <path
+ id="path21324"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker21326"
+ style="overflow:visible">
+ <path
+ id="path21328"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker21330"
+ style="overflow:visible">
+ <path
+ id="path21332"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="EmptyDiamondMend-6"
+ style="overflow:visible">
+ <path
+ id="path4197-66"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker21336"
+ style="overflow:visible">
+ <path
+ id="path21338"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+ </marker>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.58"
+ inkscape:cx="455.19061"
+ inkscape:cy="725.32431"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1280"
+ inkscape:window-height="776"
+ inkscape:window-x="0"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata12969">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(312.26788,374.46262)">
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="290.07355"
+ y="683.72107"
+ id="text13894"><tspan
+ sodipodi:role="line"
+ id="tspan13896"
+ x="290.07355"
+ y="683.72107">Local</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="176.47943"
+ y="147.90836"
+ id="text13898"><tspan
+ sodipodi:role="line"
+ id="tspan13900"
+ x="176.47943"
+ y="147.90836">Distant</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="731.52625"
+ y="360.52893"
+ id="text13902"><tspan
+ sodipodi:role="line"
+ id="tspan13904"
+ x="731.52625"
+ y="360.52893">final = <tspan
+ style="fill:#ff0000;stroke:#ff0000"
+ id="tspan14035">divergent</tspan></tspan></text>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#Arrow1Mend)"
+ d="M -149.51243,71.715908 116.10904,-98.285798"
+ id="path14093" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#Arrow1Mend)"
+ d="M -136.88118,173.93586 140.19146,310.32109"
+ id="path14093-1" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#Arrow1Mend)"
+ d="m 358.73418,-10.742763 276.5932,40.995518"
+ id="path14093-4"
+ inkscape:transform-center-x="38.2665"
+ inkscape:transform-center-y="-14.191534" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#Arrow1Mend)"
+ d="M 385.49434,405.82501 666.42726,306.55019"
+ id="path14093-42" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-316.03741"
+ y="327.08148"
+ id="text13894-3"><tspan
+ sodipodi:role="line"
+ id="tspan13896-8"
+ x="-316.03741"
+ y="327.08148">initial</tspan></text>
+ <g
+ transform="translate(536.95625,-391.35879)"
+ id="g20705">
+ <g
+ transform="translate(0,5.2380981)"
+ id="g12933-0">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-98"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,146.64336)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-811.76758"
+ y="357.005"
+ id="text12629-9-3-1-2"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-3"
+ x="-811.76758"
+ y="357.005">B</tspan></text>
+ </g>
+ <g
+ id="g12945">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-9"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,288.54815)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-810.71423"
+ y="498.90979"
+ id="text12629-9-3-1-8"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-7"
+ x="-810.71423"
+ y="498.90979">A</tspan></text>
+ </g>
+ <g
+ id="g12957">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-6"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,425.21479)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-810.71423"
+ y="635.57648"
+ id="text12629-9-3-1-83"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-5"
+ x="-810.71423"
+ y="635.57648">Z</tspan></text>
+ </g>
+ <path
+ inkscape:connection-end="#g12945"
+ inkscape:connection-start="#g12933-0"
+ inkscape:connector-type="polyline"
+ id="path12950-93"
+ d="m -797.5,393.91867 0,41.35798"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connection-end="#g12957"
+ inkscape:connection-start="#g12945"
+ inkscape:connector-type="polyline"
+ id="path12962"
+ d="m -797.5,533.2573 0,38.68599"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="translate(1065.0106,-10.420874)"
+ id="g20918">
+ <g
+ style="opacity:0.5"
+ id="g8425">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-91"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-750.72428,151.88146)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-822.54358"
+ y="362.2431"
+ id="text12629-9-3-1-3"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-8"
+ x="-822.54358"
+ y="362.2431">B</tspan></text>
+ </g>
+ <g
+ id="g10287">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-9-9"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-750.72428,288.54815)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-821.49023"
+ y="498.90979"
+ id="text12629-9-3-1-8-1"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-7-6"
+ x="-821.49023"
+ y="498.90979">A</tspan></text>
+ </g>
+ <g
+ transform="translate(-10.776028,0)"
+ id="g12957-7">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-6-9"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,425.21479)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-810.71423"
+ y="635.57648"
+ id="text12629-9-3-1-83-4"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-5-9"
+ x="-810.71423"
+ y="635.57648">Z</tspan></text>
+ </g>
+ <flowRoot
+ xml:space="preserve"
+ id="flowRoot12902"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ transform="translate(-214.28571,111.42857)"><flowRegion
+ id="flowRegion12904"><rect
+ id="rect12906"
+ width="301.42856"
+ height="435.71429"
+ x="-924.28571"
+ y="320.93362" /></flowRegion><flowPara
+ id="flowPara12908" /></flowRoot> <path
+ inkscape:connector-type="polyline"
+ id="path12950-6"
+ d="m -808.27602,393.39505 0,42.40522"
+ style="opacity:0.5;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connection-end="#g12957-7"
+ inkscape:connector-type="polyline"
+ id="path12962-1"
+ d="m -808.27602,532.73368 0,39.73323"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <g
+ style="fill:#0000ff;stroke:#0000ff"
+ id="g8286">
+ <path
+ sodipodi:type="arc"
+ style="fill:#0000ff;fill-opacity:0;fill-rule:evenodd;stroke:#0000ff;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-5"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-612.86713,62.419408)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#0000ff;fill-opacity:1;stroke:#0000ff;font-family:Bitstream Vera Sans"
+ x="-684.68646"
+ y="272.78107"
+ id="text12629-9-3-1-4"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-76-6"
+ x="-684.68646"
+ y="272.78107">B'</tspan></text>
+ </g>
+ <path
+ inkscape:connection-end="#g10287"
+ inkscape:connection-start="#g8286"
+ inkscape:connector-type="polyline"
+ transform="translate(-997.6235,206.6479)"
+ id="path8303"
+ d="M 301.69976,93.326264 214.85234,235.78314"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM);display:inline"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connection-end="#g8425"
+ inkscape:connection-start="#g8286"
+ inkscape:connector-type="polyline"
+ transform="translate(-997.6235,206.6479)"
+ id="path8430"
+ d="M 286.10442,78.162204 230.44767,114.28051"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-start:none;marker-end:url(#EmptyDiamondMend)"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="translate(1068.385,-581.11052)"
+ id="g21066">
+ <g
+ style="opacity:0.5"
+ id="g8425-4">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-50"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-750.72428,151.88146)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-822.54358"
+ y="362.2431"
+ id="text12629-9-3-1-5"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-9"
+ x="-822.54358"
+ y="362.2431">B</tspan></text>
+ </g>
+ <g
+ id="g10287-2">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-9-5"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-750.72428,288.54815)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-821.49023"
+ y="498.90979"
+ id="text12629-9-3-1-8-7"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-7-9"
+ x="-821.49023"
+ y="498.90979">A</tspan></text>
+ </g>
+ <g
+ transform="translate(-10.776028,0)"
+ id="g12957-71">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-6-47"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,425.21479)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-810.71423"
+ y="635.57648"
+ id="text12629-9-3-1-83-0"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-5-66"
+ x="-810.71423"
+ y="635.57648">Z</tspan></text>
+ </g>
+ <flowRoot
+ xml:space="preserve"
+ id="flowRoot12902-9"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ transform="translate(-214.28571,111.42857)"><flowRegion
+ id="flowRegion12904-70"><rect
+ id="rect12906-8"
+ width="301.42856"
+ height="435.71429"
+ x="-924.28571"
+ y="320.93362" /></flowRegion><flowPara
+ id="flowPara12908-61" /></flowRoot> <path
+ inkscape:connector-type="polyline"
+ id="path12950-7"
+ d="m -808.27602,393.39505 0,42.40522"
+ style="opacity:0.5;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connection-end="#g12957-71"
+ inkscape:connector-type="polyline"
+ id="path12962-3"
+ d="m -808.27602,532.73368 0,39.73323"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <g
+ style="fill:#008000;stroke:#008000"
+ id="g8294">
+ <path
+ sodipodi:type="arc"
+ style="fill:#008000;fill-opacity:0;fill-rule:evenodd;stroke:#008000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-5-2"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-888.58143,62.419408)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#008000;fill-opacity:1;stroke:#008000;font-family:Bitstream Vera Sans"
+ x="-960.40076"
+ y="272.78107"
+ id="text12629-9-3-1-4-8"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-76-6-5"
+ x="-960.40076"
+ y="272.78107">B''</tspan></text>
+ </g>
+ <path
+ inkscape:connection-end="#g10287-2"
+ inkscape:connection-start="#g8294"
+ inkscape:connector-type="polyline"
+ transform="translate(-997.6235,206.6479)"
+ id="path8305"
+ d="M 76.995186,93.326264 163.84261,235.78314"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM);display:inline"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connection-end="#g8425-4"
+ inkscape:connection-start="#g8294"
+ inkscape:connector-type="polyline"
+ transform="translate(-997.6235,206.6479)"
+ id="path8432"
+ d="M 92.590525,78.162204 148.24727,114.28051"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-end:url(#EmptyDiamondMend)"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ </g>
+ <g
+ transform="translate(1682.2151,-370.76569)"
+ id="g21276">
+ <g
+ style="opacity:0.5"
+ id="g8425-1">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-750.72428,151.88146)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-822.54358"
+ y="362.2431"
+ id="text12629-9-3-1"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0"
+ x="-822.54358"
+ y="362.2431">B</tspan></text>
+ </g>
+ <g
+ id="g10287-7">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-9-2"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-750.72428,288.54815)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-821.49023"
+ y="498.90979"
+ id="text12629-9-3-1-8-2"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-7-1"
+ x="-821.49023"
+ y="498.90979">A</tspan></text>
+ </g>
+ <g
+ transform="translate(-10.776028,0)"
+ id="g12957-9">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-6-0"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,425.21479)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-810.71423"
+ y="635.57648"
+ id="text12629-9-3-1-83-3"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-5-6"
+ x="-810.71423"
+ y="635.57648">Z</tspan></text>
+ </g>
+ <flowRoot
+ xml:space="preserve"
+ id="flowRoot12902-3"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ transform="translate(-214.28571,111.42857)"><flowRegion
+ id="flowRegion12904-7"><rect
+ id="rect12906-6"
+ width="301.42856"
+ height="435.71429"
+ x="-924.28571"
+ y="320.93362" /></flowRegion><flowPara
+ id="flowPara12908-5" /></flowRoot> <path
+ inkscape:connector-type="polyline"
+ id="path12950"
+ d="m -808.27602,393.39505 0,42.40522"
+ style="opacity:0.5;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connection-end="#g12957-9"
+ inkscape:connector-type="polyline"
+ id="path12962-5"
+ d="m -808.27602,532.73368 0,39.73323"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <g
+ style="fill:#ff0000;stroke:#ff0000"
+ id="g8286-2">
+ <path
+ sodipodi:type="arc"
+ style="fill:#ff0000;fill-opacity:0;fill-rule:evenodd;stroke:#ff0000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-5-4"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-612.86713,62.419408)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#ff0000;fill-opacity:1;stroke:#ff0000;font-family:Bitstream Vera Sans"
+ x="-684.68646"
+ y="272.78107"
+ id="text12629-9-3-1-4-5"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-76"
+ x="-684.68646"
+ y="272.78107">B'</tspan></text>
+ </g>
+ <g
+ style="fill:#ff0000;stroke:#ff0000"
+ id="g8294-2">
+ <path
+ sodipodi:type="arc"
+ style="fill:#ff0000;fill-opacity:0;fill-rule:evenodd;stroke:#ff0000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-5-2-2"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-888.58143,62.419408)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#ff0000;fill-opacity:1;stroke:#ff0000;font-family:Bitstream Vera Sans"
+ x="-960.40076"
+ y="272.78107"
+ id="text12629-9-3-1-4-8-3"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-76-6-59"
+ x="-960.40076"
+ y="272.78107">B''</tspan></text>
+ </g>
+ <path
+ inkscape:connection-end="#g10287-7"
+ inkscape:connection-start="#g8286-2"
+ inkscape:connector-type="polyline"
+ transform="translate(-997.6235,206.6479)"
+ id="path8303-8"
+ d="M 301.69976,93.326264 214.85234,235.78314"
+ style="fill:#ff0000;stroke:#ff0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM);display:inline"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connection-end="#g10287-7"
+ inkscape:connection-start="#g8294-2"
+ inkscape:connector-type="polyline"
+ transform="translate(-997.6235,206.6479)"
+ id="path8305-0"
+ d="M 76.995186,93.326264 163.84261,235.78314"
+ style="fill:#ff0000;stroke:#ff0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM);display:inline"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connection-end="#g8425-1"
+ inkscape:connection-start="#g8286-2"
+ inkscape:connector-type="polyline"
+ transform="translate(-997.6235,206.6479)"
+ id="path8430-0"
+ d="M 286.10442,78.162204 230.44767,114.28051"
+ style="fill:#ff0000;stroke:#ff0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-start:none;marker-end:url(#EmptyDiamondMend)"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connection-end="#g8425-1"
+ inkscape:connection-start="#g8294-2"
+ inkscape:connector-type="polyline"
+ transform="translate(-997.6235,206.6479)"
+ id="path8432-1"
+ d="M 92.590525,78.162204 148.24727,114.28051"
+ style="fill:#ff0000;stroke:#ff0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-end:url(#EmptyDiamondMend)"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ </g>
+ </g>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/figures/explain-troubles-latecomer-10-sumup.svg Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,1039 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="1311.8625"
+ height="879.2406"
+ id="svg12964"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="explain-troubles-latecomer-10-sumup.svg">
+ <defs
+ id="defs12966">
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Mend"
+ style="overflow:visible">
+ <path
+ id="path4078"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.4,0,0,-0.4,-4,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lend"
+ style="overflow:visible">
+ <path
+ id="path4072"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Lstart"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lstart"
+ style="overflow:visible">
+ <path
+ id="path4069"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.8,0,0,0.8,10,0)" />
+ </marker>
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective12972" />
+ <inkscape:perspective
+ id="perspective13312"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM"
+ style="overflow:visible">
+ <path
+ id="path6393"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13318"
+ style="overflow:visible">
+ <path
+ id="path13320"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective13418"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-1"
+ style="overflow:visible">
+ <path
+ id="path6393-1"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13424"
+ style="overflow:visible">
+ <path
+ id="path13426"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13428"
+ style="overflow:visible">
+ <path
+ id="path13430"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13432"
+ style="overflow:visible">
+ <path
+ id="path13434"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="EmptyDiamondMend"
+ style="overflow:visible">
+ <path
+ id="path6456"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13438"
+ style="overflow:visible">
+ <path
+ id="path13440"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective13583"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-0"
+ style="overflow:visible">
+ <path
+ id="path6393-5"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13589"
+ style="overflow:visible">
+ <path
+ id="path13591"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13593"
+ style="overflow:visible">
+ <path
+ id="path13595"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective13743"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-2"
+ style="overflow:visible">
+ <path
+ id="path6393-2"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13749"
+ style="overflow:visible">
+ <path
+ id="path13751"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13753"
+ style="overflow:visible">
+ <path
+ id="path13755"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13757"
+ style="overflow:visible">
+ <path
+ id="path13759"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="EmptyDiamondMend-3"
+ style="overflow:visible">
+ <path
+ id="path6456-4"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13763"
+ style="overflow:visible">
+ <path
+ id="path13765"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective15593"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lend-2"
+ style="overflow:visible">
+ <path
+ id="path4072-8"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective15593-5"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lend-6"
+ style="overflow:visible">
+ <path
+ id="path4072-7"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective15593-1"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lend-29"
+ style="overflow:visible">
+ <path
+ id="path4072-70"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective18500"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-4"
+ style="overflow:visible">
+ <path
+ id="path6393-20"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective18588"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-47"
+ style="overflow:visible">
+ <path
+ id="path6393-22"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker18594"
+ style="overflow:visible">
+ <path
+ id="path18596"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="EmptyDiamondMend-31"
+ style="overflow:visible">
+ <path
+ id="path4197"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective18791"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective18959"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-6"
+ style="overflow:visible">
+ <path
+ id="path6393-21"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker18965"
+ style="overflow:visible">
+ <path
+ id="path18967"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-1-4"
+ style="overflow:visible">
+ <path
+ id="path6393-3"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="EmptyDiamondMend-2"
+ style="overflow:visible">
+ <path
+ id="path4197-2"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective19288"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-44"
+ style="overflow:visible">
+ <path
+ id="path6393-9"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker19294"
+ style="overflow:visible">
+ <path
+ id="path19296"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.58"
+ inkscape:cx="455.19061"
+ inkscape:cy="630.49672"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1918"
+ inkscape:window-height="1165"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="0" />
+ <metadata
+ id="metadata12969">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(312.26788,289.78072)">
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="279.72873"
+ y="588.89349"
+ id="text13894"><tspan
+ sodipodi:role="line"
+ id="tspan13896"
+ x="279.72873"
+ y="588.89349">Local</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="176.47943"
+ y="147.90836"
+ id="text13898"><tspan
+ sodipodi:role="line"
+ id="tspan13900"
+ x="176.47943"
+ y="147.90836">Distant</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="731.52625"
+ y="360.52893"
+ id="text13902"><tspan
+ sodipodi:role="line"
+ id="tspan13904"
+ x="731.52625"
+ y="360.52893">final = <tspan
+ style="fill:#ff0000;stroke:#ff0000"
+ id="tspan14035">tardif</tspan></tspan></text>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#Arrow1Mend)"
+ d="M -149.51243,71.715908 116.10904,-98.285798"
+ id="path14093" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#Arrow1Mend)"
+ d="M -136.88118,173.93586 140.19146,310.32109"
+ id="path14093-1" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#Arrow1Mend)"
+ d="m 358.73418,-10.742763 276.5932,40.995518"
+ id="path14093-4"
+ inkscape:transform-center-x="38.2665"
+ inkscape:transform-center-y="-14.191534" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#Arrow1Mend)"
+ d="M 385.49434,405.82501 666.42726,306.55019"
+ id="path14093-42" />
+ <g
+ transform="translate(536.84443,-411.12056)"
+ id="g18477">
+ <g
+ id="g12945">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-9"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,288.54815)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-810.71423"
+ y="498.90979"
+ id="text12629-9-3-1-8"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-7"
+ x="-810.71423"
+ y="498.90979">A</tspan></text>
+ </g>
+ <g
+ id="g12957">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-6"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,425.21479)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-810.71423"
+ y="635.57648"
+ id="text12629-9-3-1-83"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-5"
+ x="-810.71423"
+ y="635.57648">Z</tspan></text>
+ </g>
+ <flowRoot
+ xml:space="preserve"
+ id="flowRoot12902"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ transform="translate(-214.28571,111.42857)"><flowRegion
+ id="flowRegion12904"><rect
+ id="rect12906"
+ width="301.42856"
+ height="435.71429"
+ x="-924.28571"
+ y="320.93362" /></flowRegion><flowPara
+ id="flowPara12908" /></flowRoot> <path
+ inkscape:connection-end="#g12957"
+ inkscape:connection-start="#g12945"
+ inkscape:connector-type="polyline"
+ id="path12962"
+ d="m -797.5,533.2573 0,38.68599"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)" />
+ </g>
+ <g
+ transform="translate(1048.9196,-141.60299)"
+ id="g18559">
+ <g
+ style="opacity:0.5"
+ id="g12945-6">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-9-5"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,288.54815)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-810.71423"
+ y="498.90979"
+ id="text12629-9-3-1-8-5"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-7-9"
+ x="-810.71423"
+ y="498.90979">A</tspan></text>
+ </g>
+ <g
+ id="g12957-33">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-6-80"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,425.21479)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-810.71423"
+ y="635.57648"
+ id="text12629-9-3-1-83-1"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-5-0"
+ x="-810.71423"
+ y="635.57648">Z</tspan></text>
+ </g>
+ <flowRoot
+ xml:space="preserve"
+ id="flowRoot12902-9"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ transform="translate(-214.28571,111.42857)"><flowRegion
+ id="flowRegion12904-8"><rect
+ id="rect12906-6"
+ width="301.42856"
+ height="435.71429"
+ x="-924.28571"
+ y="320.93362" /></flowRegion><flowPara
+ id="flowPara12908-3" /></flowRoot> <path
+ inkscape:connection-end="#g12957-33"
+ inkscape:connection-start="#g12945-6"
+ inkscape:connector-type="polyline"
+ id="path12962-09"
+ d="m -797.5,533.2573 0,38.68599"
+ style="opacity:0.5;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)" />
+ <g
+ id="g3273">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-9-4"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-598.58143,208.13369)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-669.34741"
+ y="418.49533"
+ id="text12629-9-3-1-8-2"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-7-7-4"
+ x="-669.34741"
+ y="418.49533">A'</tspan></text>
+ </g>
+ <path
+ inkscape:connection-end="#g12957-33"
+ inkscape:connection-start="#g3273"
+ inkscape:connector-type="polyline"
+ transform="translate(-848.99032,352.36219)"
+ id="path3278"
+ d="M 166.11979,92.547868 78.227679,227.51388"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)" />
+ <path
+ inkscape:connection-end="#g12945-6"
+ inkscape:connection-start="#g3273"
+ inkscape:connector-type="polyline"
+ transform="translate(-848.99032,352.36219)"
+ id="path3280"
+ d="M 150.2668,75.717222 94.08067,107.67788"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-mid:none;marker-end:url(#EmptyDiamondMend)" />
+ </g>
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-316.03741"
+ y="327.08148"
+ id="text13894-3"><tspan
+ sodipodi:role="line"
+ id="tspan13896-8"
+ x="-316.03741"
+ y="327.08148">initial</tspan></text>
+ <g
+ transform="translate(1607.395,-370.37344)"
+ id="g18925">
+ <g
+ transform="translate(0,5.2380981)"
+ id="g12933">
+ <path
+ sodipodi:type="arc"
+ style="fill:#d4aa00;fill-opacity:0;fill-rule:evenodd;stroke:#d4aa00;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,146.64336)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#d4aa00;fill-opacity:1;stroke:#d4aa00;font-family:Bitstream Vera Sans"
+ x="-841.76758"
+ y="358.43356"
+ id="text12629-9-3-1"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0"
+ x="-841.76758"
+ y="358.43356">v4.2</tspan></text>
+ </g>
+ <g
+ id="g12945-7">
+ <path
+ sodipodi:type="arc"
+ style="fill:#d4aa00;fill-opacity:0;fill-rule:evenodd;stroke:#d4aa00;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-9-2"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,288.54815)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-810.71423"
+ y="498.90979"
+ id="text12629-9-3-1-8-25"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-7-1"
+ x="-810.71423"
+ y="498.90979">A</tspan></text>
+ </g>
+ <g
+ id="g12957-38">
+ <path
+ sodipodi:type="arc"
+ style="fill:#d4aa00;fill-opacity:0;fill-rule:evenodd;stroke:#d4aa00;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-6-4"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,425.21479)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-810.71423"
+ y="635.57648"
+ id="text12629-9-3-1-83-8"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-5-6"
+ x="-810.71423"
+ y="635.57648">Z</tspan></text>
+ </g>
+ <flowRoot
+ xml:space="preserve"
+ id="flowRoot12902-3"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ transform="translate(-214.28571,111.42857)"><flowRegion
+ id="flowRegion12904-7"><rect
+ id="rect12906-4"
+ width="301.42856"
+ height="435.71429"
+ x="-924.28571"
+ y="320.93362" /></flowRegion><flowPara
+ id="flowPara12908-6" /></flowRoot> <path
+ inkscape:connection-start="#g12933"
+ inkscape:connection-end="#g12945-7"
+ inkscape:connector-type="polyline"
+ id="path12950"
+ d="m -797.5,393.91867 0,41.35798"
+ style="fill:#d4aa00;stroke:#d4aa00;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)" />
+ <path
+ inkscape:connection-end="#g12957-38"
+ inkscape:connection-start="#g12945-7"
+ inkscape:connector-type="polyline"
+ id="path12962-2"
+ d="m -797.5,533.2573 0,38.68599"
+ style="fill:#d4aa00;stroke:#d4aa00;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)" />
+ <g
+ id="g7062">
+ <path
+ sodipodi:type="arc"
+ style="fill:#ff0000;fill-opacity:0;fill-rule:evenodd;stroke:#ff0000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-9-4-1"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-601.73896,221.4909)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#ff0000;fill-opacity:1;stroke:#ff0000;font-family:Bitstream Vera Sans"
+ x="-672.50494"
+ y="431.85254"
+ id="text12629-9-3-1-8-2-2"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-7-7"
+ x="-672.50494"
+ y="431.85254">A'</tspan></text>
+ </g>
+ <path
+ inkscape:connection-end="#g12957-38"
+ inkscape:connection-start="#g7062"
+ inkscape:connector-type="polyline"
+ transform="translate(-848.99032,296.10995)"
+ id="path7067"
+ d="M 162.19312,161.64503 78.99682,284.27841"
+ style="fill:#ff0000;stroke:#ff0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM-1)" />
+ <path
+ inkscape:connection-end="#g12945-7"
+ inkscape:connection-start="#g7062"
+ inkscape:connector-type="polyline"
+ transform="translate(-848.99032,296.10995)"
+ id="path7069"
+ d="M 145.61323,142.48988 95.576703,166.76692"
+ style="fill:#ff0000;stroke:#ff0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-end:url(#EmptyDiamondMend)" />
+ </g>
+ <g
+ transform="translate(1040.2927,-585.89067)"
+ id="g19264">
+ <g
+ id="g12933-2"
+ transform="translate(0,5.2380981)">
+ <path
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,146.64336)"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ sodipodi:ry="100"
+ sodipodi:rx="147.14285"
+ sodipodi:cy="399.50504"
+ sodipodi:cx="-172.85715"
+ id="path12627-8-4-1-3"
+ style="fill:#d4aa00;fill-opacity:0;fill-rule:evenodd;stroke:#d4aa00;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <text
+ id="text12629-9-3-1-80"
+ y="358.43356"
+ x="-841.76758"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#d4aa00;fill-opacity:1;stroke:#d4aa00;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="358.43356"
+ x="-841.76758"
+ id="tspan12631-6-9-0-76"
+ sodipodi:role="line">v4.2</tspan></text>
+ </g>
+ <g
+ id="g12945-76">
+ <path
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,288.54815)"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ sodipodi:ry="100"
+ sodipodi:rx="147.14285"
+ sodipodi:cy="399.50504"
+ sodipodi:cx="-172.85715"
+ id="path12627-8-4-1-9-29"
+ style="fill:#d4aa00;fill-opacity:0;fill-rule:evenodd;stroke:#d4aa00;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <text
+ id="text12629-9-3-1-8-9"
+ y="498.90979"
+ x="-810.71423"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="498.90979"
+ x="-810.71423"
+ id="tspan12631-6-9-0-7-0"
+ sodipodi:role="line">A</tspan></text>
+ </g>
+ <g
+ id="g12957-39">
+ <path
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,425.21479)"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ sodipodi:ry="100"
+ sodipodi:rx="147.14285"
+ sodipodi:cy="399.50504"
+ sodipodi:cx="-172.85715"
+ id="path12627-8-4-1-6-81"
+ style="fill:#d4aa00;fill-opacity:0;fill-rule:evenodd;stroke:#d4aa00;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <text
+ id="text12629-9-3-1-83-7"
+ y="635.57648"
+ x="-810.71423"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="635.57648"
+ x="-810.71423"
+ id="tspan12631-6-9-0-5-08"
+ sodipodi:role="line">Z</tspan></text>
+ </g>
+ <path
+ style="fill:#d4aa00;stroke:#d4aa00;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ d="m -797.5,393.91867 0,41.35798"
+ id="path12950-9"
+ inkscape:connector-type="polyline"
+ inkscape:connection-end="#g12945-76"
+ inkscape:connection-start="#g12933-2" />
+ <path
+ style="fill:#d4aa00;stroke:#d4aa00;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ d="m -797.5,533.2573 0,38.68599"
+ id="path12962-0"
+ inkscape:connector-type="polyline"
+ inkscape:connection-start="#g12945-76"
+ inkscape:connection-end="#g12957-39" />
+ </g>
+ </g>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/figures/explain-troubles-latecomer-15-solution.svg Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,994 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="557.31696"
+ height="487.83316"
+ id="svg12964"
+ version="1.1"
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="explain-troubles-latecomer-15-solution.svg">
+ <defs
+ id="defs12966">
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Mend"
+ style="overflow:visible">
+ <path
+ id="path4078"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.4,0,0,-0.4,-4,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lend"
+ style="overflow:visible">
+ <path
+ id="path4072"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.8,0,0,-0.8,-10,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Lstart"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lstart"
+ style="overflow:visible">
+ <path
+ id="path4069"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.8,0,0,0.8,10,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective12972" />
+ <inkscape:perspective
+ id="perspective13312"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM"
+ style="overflow:visible">
+ <path
+ id="path6393"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13318"
+ style="overflow:visible">
+ <path
+ id="path13320"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ id="perspective13418"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-1"
+ style="overflow:visible">
+ <path
+ id="path6393-1"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13424"
+ style="overflow:visible">
+ <path
+ id="path13426"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13428"
+ style="overflow:visible">
+ <path
+ id="path13430"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13432"
+ style="overflow:visible">
+ <path
+ id="path13434"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="EmptyDiamondMend"
+ style="overflow:visible">
+ <path
+ id="path6456"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13438"
+ style="overflow:visible">
+ <path
+ id="path13440"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ id="perspective13583"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-0"
+ style="overflow:visible">
+ <path
+ id="path6393-5"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13589"
+ style="overflow:visible">
+ <path
+ id="path13591"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13593"
+ style="overflow:visible">
+ <path
+ id="path13595"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ id="perspective13743"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-2"
+ style="overflow:visible">
+ <path
+ id="path6393-2"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13749"
+ style="overflow:visible">
+ <path
+ id="path13751"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13753"
+ style="overflow:visible">
+ <path
+ id="path13755"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13757"
+ style="overflow:visible">
+ <path
+ id="path13759"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="EmptyDiamondMend-3"
+ style="overflow:visible">
+ <path
+ id="path6456-4"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13763"
+ style="overflow:visible">
+ <path
+ id="path13765"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ id="perspective15593"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lend-2"
+ style="overflow:visible">
+ <path
+ id="path4072-8"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.8,0,0,-0.8,-10,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ id="perspective15593-5"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lend-6"
+ style="overflow:visible">
+ <path
+ id="path4072-7"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.8,0,0,-0.8,-10,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ id="perspective15593-1"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lend-29"
+ style="overflow:visible">
+ <path
+ id="path4072-70"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.8,0,0,-0.8,-10,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ id="perspective18500"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-4"
+ style="overflow:visible">
+ <path
+ id="path6393-20"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ id="perspective18588"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-47"
+ style="overflow:visible">
+ <path
+ id="path6393-22"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker18594"
+ style="overflow:visible">
+ <path
+ id="path18596"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="EmptyDiamondMend-31"
+ style="overflow:visible">
+ <path
+ id="path4197"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ id="perspective18791"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective18959"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-6"
+ style="overflow:visible">
+ <path
+ id="path6393-21"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker18965"
+ style="overflow:visible">
+ <path
+ id="path18967"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-1-4"
+ style="overflow:visible">
+ <path
+ id="path6393-3"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="EmptyDiamondMend-2"
+ style="overflow:visible">
+ <path
+ id="path4197-2"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ id="perspective19288"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-44"
+ style="overflow:visible">
+ <path
+ id="path6393-9"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker19294"
+ style="overflow:visible">
+ <path
+ id="path19296"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-7"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path6393-6"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker6176"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path6178"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-1-7"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path6393-1-6"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="EmptyDiamondMend-8"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path6456-0"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+ </marker>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.58"
+ inkscape:cx="588.77184"
+ inkscape:cy="64.133389"
+ inkscape:document-units="px"
+ inkscape:current-layer="g7062-0"
+ showgrid="false"
+ inkscape:window-width="1215"
+ inkscape:window-height="776"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ fit-margin-top="5"
+ fit-margin-right="5"
+ fit-margin-left="5"
+ fit-margin-bottom="5" />
+ <metadata
+ id="metadata12969">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(170.29334,188.87454)">
+ <g
+ id="g6078">
+ <g
+ id="g18925"
+ transform="translate(683.25707,-378.99413)">
+ <g
+ id="g12933"
+ transform="translate(0,5.2380981)">
+ <path
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,146.64336)"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ sodipodi:ry="100"
+ sodipodi:rx="147.14285"
+ sodipodi:cy="399.50504"
+ sodipodi:cx="-172.85715"
+ id="path12627-8-4-1"
+ style="fill:#d4aa00;fill-opacity:0;fill-rule:evenodd;stroke:#d4aa00;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <text
+ id="text12629-9-3-1"
+ y="358.43356"
+ x="-841.76758"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#d4aa00;fill-opacity:1;stroke:#d4aa00;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="358.43356"
+ x="-841.76758"
+ id="tspan12631-6-9-0"
+ sodipodi:role="line">v4.2</tspan></text>
+ </g>
+ <g
+ id="g12945-7">
+ <path
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,288.54815)"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ sodipodi:ry="100"
+ sodipodi:rx="147.14285"
+ sodipodi:cy="399.50504"
+ sodipodi:cx="-172.85715"
+ id="path12627-8-4-1-9-2"
+ style="fill:#d4aa00;fill-opacity:0;fill-rule:evenodd;stroke:#d4aa00;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <text
+ id="text12629-9-3-1-8-25"
+ y="498.90979"
+ x="-810.71423"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="498.90979"
+ x="-810.71423"
+ id="tspan12631-6-9-0-7-1"
+ sodipodi:role="line">A</tspan></text>
+ </g>
+ <g
+ id="g12957-38">
+ <path
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,425.21479)"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ sodipodi:ry="100"
+ sodipodi:rx="147.14285"
+ sodipodi:cy="399.50504"
+ sodipodi:cx="-172.85715"
+ id="path12627-8-4-1-6-4"
+ style="fill:#d4aa00;fill-opacity:0;fill-rule:evenodd;stroke:#d4aa00;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <text
+ id="text12629-9-3-1-83-8"
+ y="635.57648"
+ x="-810.71423"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="635.57648"
+ x="-810.71423"
+ id="tspan12631-6-9-0-5-6"
+ sodipodi:role="line">Z</tspan></text>
+ </g>
+ <flowRoot
+ transform="translate(-214.28571,111.42857)"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ id="flowRoot12902-3"
+ xml:space="preserve"><flowRegion
+ id="flowRegion12904-7"><rect
+ y="320.93362"
+ x="-924.28571"
+ height="435.71429"
+ width="301.42856"
+ id="rect12906-4" /></flowRegion><flowPara
+ id="flowPara12908-6" /></flowRoot> <path
+ inkscape:connector-curvature="0"
+ inkscape:connection-end-point="d4"
+ inkscape:connection-start-point="d4"
+ style="fill:#d4aa00;stroke:#d4aa00;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ d="m -797.5,393.91867 0,41.35798"
+ id="path12950"
+ inkscape:connector-type="polyline"
+ inkscape:connection-end="#g12945-7"
+ inkscape:connection-start="#g12933" />
+ <path
+ inkscape:connector-curvature="0"
+ inkscape:connection-end-point="d4"
+ inkscape:connection-start-point="d4"
+ style="fill:#d4aa00;stroke:#d4aa00;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ d="m -797.5,533.2573 0,38.68599"
+ id="path12962-2"
+ inkscape:connector-type="polyline"
+ inkscape:connection-start="#g12945-7"
+ inkscape:connection-end="#g12957-38" />
+ <g
+ id="g7062">
+ <path
+ transform="matrix(0.33294398,0,0,0.48990327,-601.73896,221.4909)"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ sodipodi:ry="100"
+ sodipodi:rx="147.14285"
+ sodipodi:cy="399.50504"
+ sodipodi:cx="-172.85715"
+ id="path12627-8-4-1-9-4-1"
+ style="fill:#ff0000;fill-opacity:0;fill-rule:evenodd;stroke:#ff0000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <text
+ id="text12629-9-3-1-8-2-2"
+ y="431.85254"
+ x="-672.50494"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#ff0000;fill-opacity:1;stroke:#ff0000;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="431.85254"
+ x="-672.50494"
+ id="tspan12631-6-9-0-7-7"
+ sodipodi:role="line">A'</tspan></text>
+ </g>
+ <path
+ inkscape:connector-curvature="0"
+ inkscape:connection-end-point="d4"
+ inkscape:connection-start-point="d4"
+ style="fill:#ff0000;stroke:#ff0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM-1)"
+ d="M 162.19312,161.64503 78.99682,284.27841"
+ id="path7067"
+ transform="translate(-848.99032,296.10995)"
+ inkscape:connector-type="polyline"
+ inkscape:connection-start="#g7062"
+ inkscape:connection-end="#g12957-38" />
+ <path
+ inkscape:connector-curvature="0"
+ inkscape:connection-end-point="d4"
+ inkscape:connection-start-point="d4"
+ style="fill:#ff0000;stroke:#ff0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-end:url(#EmptyDiamondMend)"
+ d="M 145.61323,142.48988 95.576703,166.76692"
+ id="path7069"
+ transform="translate(-848.99032,296.10995)"
+ inkscape:connector-type="polyline"
+ inkscape:connection-start="#g7062"
+ inkscape:connection-end="#g12945-7" />
+ </g>
+ </g>
+ <g
+ transform="translate(990.2654,-377.97948)"
+ id="g18925-6">
+ <g
+ transform="translate(0,5.2380981)"
+ id="g12933-0">
+ <path
+ sodipodi:type="arc"
+ style="fill:#d4aa00;fill-opacity:0;fill-rule:evenodd;stroke:#d4aa00;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-8"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,146.64336)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#d4aa00;fill-opacity:1;stroke:#d4aa00;font-family:Bitstream Vera Sans"
+ x="-841.76758"
+ y="358.43356"
+ id="text12629-9-3-1-9"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-4"
+ x="-841.76758"
+ y="358.43356">v4.2</tspan></text>
+ </g>
+ <g
+ id="g12945-7-0">
+ <path
+ sodipodi:type="arc"
+ style="fill:#d4aa00;fill-opacity:0;fill-rule:evenodd;stroke:#d4aa00;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-9-2-6"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,288.54815)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-810.71423"
+ y="498.90979"
+ id="text12629-9-3-1-8-25-0"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-7-1-0"
+ x="-810.71423"
+ y="498.90979">A</tspan></text>
+ </g>
+ <g
+ id="g12957-38-9">
+ <path
+ sodipodi:type="arc"
+ style="fill:#d4aa00;fill-opacity:0;fill-rule:evenodd;stroke:#d4aa00;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-6-4-2"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,425.21479)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-810.71423"
+ y="635.57648"
+ id="text12629-9-3-1-83-8-7"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-5-6-6"
+ x="-810.71423"
+ y="635.57648">Z</tspan></text>
+ </g>
+ <flowRoot
+ xml:space="preserve"
+ id="flowRoot12902-3-4"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ transform="translate(-214.28571,111.42857)"><flowRegion
+ id="flowRegion12904-7-4"><rect
+ id="rect12906-4-2"
+ width="301.42856"
+ height="435.71429"
+ x="-924.28571"
+ y="320.93362" /></flowRegion><flowPara
+ id="flowPara12908-6-9" /></flowRoot> <path
+ inkscape:connection-start="#g12933-0"
+ inkscape:connection-end="#g12945-7-0"
+ inkscape:connector-type="polyline"
+ id="path12950-5"
+ d="m -797.5,393.91867 0,41.35798"
+ style="fill:#d4aa00;stroke:#d4aa00;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connection-end="#g12957-38-9"
+ inkscape:connection-start="#g12945-7-0"
+ inkscape:connector-type="polyline"
+ id="path12962-2-2"
+ d="m -797.5,533.2573 0,38.68599"
+ style="fill:#d4aa00;stroke:#d4aa00;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <g
+ id="g7062-0">
+ <path
+ sodipodi:type="arc"
+ style="opacity:0.5;fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-9-4-1-8"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-601.73896,221.4909)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;opacity:0.5;fill:#000000;fill-opacity:1;stroke:#000000;font-family:Bitstream Vera Sans"
+ x="-672.50494"
+ y="431.85254"
+ id="text12629-9-3-1-8-2-2-6"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-7-7-2"
+ x="-672.50494"
+ y="431.85254">A'</tspan></text>
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-9-4-1-8-3"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-602.70567,72.41019)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:#000000;font-family:Bitstream Vera Sans"
+ x="-671.47168"
+ y="282.77182"
+ id="text12629-9-3-1-8-2-2-6-2"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-7-7-2-8"
+ x="-671.47168"
+ y="282.77182">Aᵟ</tspan></text>
+ <path
+ style="fill:#000000;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-end:url(#EmptyDiamondMend-8)"
+ d="m 643.10345,205.10267 0,51.72414"
+ id="path6304"
+ inkscape:connector-curvature="0"
+ transform="translate(-1302.5333,110.19876)" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM-1-7)"
+ d="m -697.8407,298.53986 -80.747,140.6978"
+ id="path6306"
+ inkscape:connector-curvature="0" />
+ </g>
+ <path
+ inkscape:connector-type="polyline"
+ id="path7067-4"
+ d="m -695.12005,452.57296 -84.97116,125.65959"
+ style="opacity:0.5;fill:#000000;stroke:#000000;stroke-width:3.06777191;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM-1)"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-type="polyline"
+ id="path7069-5"
+ d="m -705.04154,428.01168 -51.05239,29.6913"
+ style="opacity:0.5;fill:#000000;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-end:url(#EmptyDiamondMend)"
+ inkscape:connector-curvature="0" />
+ </g>
+ </g>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/figures/explain-troubles-unstable-10-sumup.svg Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,1101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="1414.5707"
+ height="1196.5396"
+ id="svg12964"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="explain-troubles-unstable-10-sumup.svg">
+ <defs
+ id="defs12966">
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow1Mend"
+ style="overflow:visible;">
+ <path
+ id="path4078"
+ d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
+ transform="scale(0.4) rotate(180) translate(10,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow1Lend"
+ style="overflow:visible;">
+ <path
+ id="path4072"
+ d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
+ transform="scale(0.8) rotate(180) translate(12.5,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Lstart"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow1Lstart"
+ style="overflow:visible">
+ <path
+ id="path4069"
+ d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
+ transform="scale(0.8) translate(12.5,0)" />
+ </marker>
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective12972" />
+ <inkscape:perspective
+ id="perspective13312"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM"
+ style="overflow:visible">
+ <path
+ id="path6393"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13318"
+ style="overflow:visible">
+ <path
+ id="path13320"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective13418"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-1"
+ style="overflow:visible">
+ <path
+ id="path6393-1"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13424"
+ style="overflow:visible">
+ <path
+ id="path13426"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13428"
+ style="overflow:visible">
+ <path
+ id="path13430"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13432"
+ style="overflow:visible">
+ <path
+ id="path13434"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="EmptyDiamondMend"
+ style="overflow:visible">
+ <path
+ id="path6456"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13438"
+ style="overflow:visible">
+ <path
+ id="path13440"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective13583"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-0"
+ style="overflow:visible">
+ <path
+ id="path6393-5"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13589"
+ style="overflow:visible">
+ <path
+ id="path13591"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13593"
+ style="overflow:visible">
+ <path
+ id="path13595"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective13743"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-2"
+ style="overflow:visible">
+ <path
+ id="path6393-2"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13749"
+ style="overflow:visible">
+ <path
+ id="path13751"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13753"
+ style="overflow:visible">
+ <path
+ id="path13755"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13757"
+ style="overflow:visible">
+ <path
+ id="path13759"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="EmptyDiamondMend-3"
+ style="overflow:visible">
+ <path
+ id="path6456-4"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13763"
+ style="overflow:visible">
+ <path
+ id="path13765"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective15593"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lend-2"
+ style="overflow:visible">
+ <path
+ id="path4072-8"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective15593-5"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lend-6"
+ style="overflow:visible">
+ <path
+ id="path4072-7"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+ </marker>
+ <inkscape:perspective
+ id="perspective15593-1"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lend-29"
+ style="overflow:visible">
+ <path
+ id="path4072-70"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.8,0,0,-0.8,-10,0)" />
+ </marker>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.58"
+ inkscape:cx="460.47484"
+ inkscape:cy="579.06827"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1918"
+ inkscape:window-height="1165"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="0" />
+ <metadata
+ id="metadata12969">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(317.55211,451.61155)">
+ <g
+ id="g16677">
+ <g
+ transform="translate(63.770124,322.85714)"
+ id="g13934">
+ <g
+ transform="translate(994.04378,-358.66548)"
+ id="g13382">
+ <g
+ style="opacity:0.5"
+ transform="translate(0,5.2380981)"
+ id="g12933-9">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-8"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,146.64336)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-811.76758"
+ y="357.005"
+ id="text12629-9-3-1-4"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-9"
+ x="-811.76758"
+ y="357.005">B</tspan></text>
+ </g>
+ <g
+ style="opacity:0.5"
+ id="g12945-3">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-9-9"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,288.54815)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-810.71423"
+ y="498.90979"
+ id="text12629-9-3-1-8-9"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-7-0"
+ x="-810.71423"
+ y="498.90979">A</tspan></text>
+ </g>
+ <g
+ id="g12957-8">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-6-3"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,425.21479)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-810.71423"
+ y="635.57648"
+ id="text12629-9-3-1-83-0"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-5-1"
+ x="-810.71423"
+ y="635.57648">Z</tspan></text>
+ </g>
+ <path
+ inkscape:connection-end="#g12945-3"
+ inkscape:connection-start="#g12933-9"
+ inkscape:connector-type="polyline"
+ id="path12950-7"
+ d="m -797.5,393.91867 0,41.35798"
+ style="opacity:0.5;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)" />
+ <path
+ inkscape:connection-end="#g12957-8"
+ inkscape:connection-start="#g12945-3"
+ inkscape:connector-type="polyline"
+ id="path12962-0"
+ d="m -797.5,533.2573 0,38.68599"
+ style="opacity:0.5;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)" />
+ <g
+ id="g14080">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-67"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-580.01,81.22892)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-651.82935"
+ y="291.59058"
+ id="text12629-9-3-1-2"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-77"
+ x="-651.82935"
+ y="291.59058">B'</tspan></text>
+ </g>
+ <g
+ id="g14034">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-9-2"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-580.01,217.89561)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-650.776"
+ y="428.25726"
+ id="text12629-9-3-1-8-0"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-7-7"
+ x="-650.776"
+ y="428.25726">A'</tspan></text>
+ </g>
+ <path
+ inkscape:connection-end="#g12957-8"
+ inkscape:connection-start="#g14034"
+ inkscape:connector-type="polyline"
+ transform="translate(-848.99032,225.45742)"
+ id="path14087"
+ d="M 181.50292,226.948 81.415976,356.68521"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)" />
+ <path
+ inkscape:connection-end="#g14034"
+ inkscape:connection-start="#g14080"
+ inkscape:connector-type="polyline"
+ transform="translate(-848.99032,225.45742)"
+ id="path14089"
+ d="m 211.42857,100.48065 0,38.68604"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)" />
+ <path
+ inkscape:connection-end="#g12945-3"
+ inkscape:connection-start="#g14034"
+ inkscape:connector-type="polyline"
+ transform="translate(-848.99032,225.45742)"
+ id="path14463"
+ d="M 166.6047,207.95791 96.314201,239.00866"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-start:none;marker-mid:none;marker-end:url(#EmptyDiamondMend)" />
+ <path
+ inkscape:connection-start="#g14080"
+ inkscape:connection-end="#g12933-9"
+ transform="translate(-848.99032,225.45742)"
+ inkscape:connector-type="polyline"
+ id="path14465"
+ d="M 166.6047,71.29122 97.24687,101.92996"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-start:none;marker-mid:none;marker-end:url(#EmptyDiamondMend)" />
+ </g>
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="224.57932"
+ y="372.93292"
+ id="text13894"><tspan
+ sodipodi:role="line"
+ id="tspan13896"
+ x="224.57932"
+ y="372.93292">Local</tspan></text>
+ </g>
+ <g
+ transform="translate(53.152706,-930.19704)"
+ id="g13910">
+ <g
+ transform="translate(999.11715,331.93758)"
+ id="g13554">
+ <g
+ transform="translate(2.11198,-3.2921448)"
+ id="g12933-2">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-1"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,146.64336)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-811.76758"
+ y="357.005"
+ id="text12629-9-3-1-0"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-1"
+ x="-811.76758"
+ y="357.005">B</tspan></text>
+ </g>
+ <g
+ transform="translate(2.11198,-4.265152)"
+ id="g12945-7">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-9-0"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,288.54815)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-810.71423"
+ y="498.90979"
+ id="text12629-9-3-1-8-8"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-7-07"
+ x="-810.71423"
+ y="498.90979">A</tspan></text>
+ </g>
+ <g
+ transform="translate(2.11198,0)"
+ id="g12957-6">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-6-7"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,425.21479)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-810.71423"
+ y="635.57648"
+ id="text12629-9-3-1-83-3"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-5-9"
+ x="-810.71423"
+ y="635.57648">Z</tspan></text>
+ </g>
+ <path
+ inkscape:connector-curvature="0"
+ inkscape:connection-end-point="d4"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end="#g12945-7"
+ inkscape:connection-start="#g12933-2"
+ inkscape:connector-type="polyline"
+ id="path12950-8"
+ d="m -795.38802,389.71981 0,43.48719"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)" />
+ <path
+ inkscape:connector-curvature="0"
+ inkscape:connection-end-point="d4"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end="#g12957-6"
+ inkscape:connection-start="#g12945-7"
+ inkscape:connector-type="polyline"
+ id="path12962-3"
+ d="m -795.38802,531.14792 0,40.81523"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)" />
+ <g
+ transform="translate(-2.11198,0)"
+ id="g13397">
+ <path
+ sodipodi:type="arc"
+ style="fill:#0000ff;fill-opacity:0;fill-rule:evenodd;stroke:#0000ff;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-0"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-735.72429,2.41941)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-807.54364"
+ y="212.78105"
+ id="text12629-9-3-1-7"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-6"
+ x="-807.54364"
+ y="212.78105">C</tspan></text>
+ </g>
+ <path
+ inkscape:connector-curvature="0"
+ inkscape:connection-end-point="d4"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end="#g12933-2"
+ inkscape:connection-start="#g13397"
+ inkscape:connector-type="polyline"
+ transform="translate(-848.99032,296.10995)"
+ id="path13402"
+ d="m 53.602303,-49.001257 0,44.6701979"
+ style="fill:#0000ff;stroke:#0000ff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#DotM)" />
+ </g>
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="130.22327"
+ y="1072.933"
+ id="text13898"><tspan
+ sodipodi:role="line"
+ id="tspan13900"
+ x="130.22327"
+ y="1072.933">Distant</tspan></text>
+ </g>
+ </g>
+ <g
+ id="g14037"
+ transform="translate(-12.610837,-438.21686)">
+ <g
+ id="g13702"
+ transform="translate(1669.5314,38.478002)">
+ <g
+ id="g12933-3"
+ transform="translate(0.68341,5.2381)"
+ style="opacity:0.5">
+ <path
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,146.64336)"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ sodipodi:ry="100"
+ sodipodi:rx="147.14285"
+ sodipodi:cy="399.50504"
+ sodipodi:cx="-172.85715"
+ id="path12627-8-4-1-5"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <text
+ id="text12629-9-3-1-28"
+ y="357.005"
+ x="-811.76758"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="357.005"
+ x="-811.76758"
+ id="tspan12631-6-9-0-73"
+ sodipodi:role="line">B</tspan></text>
+ </g>
+ <g
+ id="g12945-5"
+ style="opacity:0.5"
+ transform="translate(0.68341,0)">
+ <path
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,288.54815)"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ sodipodi:ry="100"
+ sodipodi:rx="147.14285"
+ sodipodi:cy="399.50504"
+ sodipodi:cx="-172.85715"
+ id="path12627-8-4-1-9-8"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <text
+ id="text12629-9-3-1-8-87"
+ y="498.90979"
+ x="-810.71423"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="498.90979"
+ x="-810.71423"
+ id="tspan12631-6-9-0-7-3"
+ sodipodi:role="line">A</tspan></text>
+ </g>
+ <g
+ id="g12957-3"
+ transform="translate(0.68341,0)">
+ <path
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,425.21479)"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ sodipodi:ry="100"
+ sodipodi:rx="147.14285"
+ sodipodi:cy="399.50504"
+ sodipodi:cx="-172.85715"
+ id="path12627-8-4-1-6-8"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <text
+ id="text12629-9-3-1-83-5"
+ y="635.57648"
+ x="-810.71423"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="635.57648"
+ x="-810.71423"
+ id="tspan12631-6-9-0-5-4"
+ sodipodi:role="line">Z</tspan></text>
+ </g>
+ <path
+ style="opacity:0.5;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ d="m -796.81659,393.91659 0,41.36213"
+ id="path12950-85"
+ inkscape:connector-type="polyline"
+ inkscape:connection-start="#g12933-3"
+ inkscape:connection-end="#g12945-5"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <path
+ style="opacity:0.5;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ d="m -796.81659,533.25522 0,38.69014"
+ id="path12962-4"
+ inkscape:connector-type="polyline"
+ inkscape:connection-start="#g12945-5"
+ inkscape:connection-end="#g12957-3"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <g
+ id="g14080-8">
+ <path
+ transform="matrix(0.33294398,0,0,0.48990327,-580.01,81.22892)"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ sodipodi:ry="100"
+ sodipodi:rx="147.14285"
+ sodipodi:cy="399.50504"
+ sodipodi:cx="-172.85715"
+ id="path12627-8-4-1-67-4"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <text
+ id="text12629-9-3-1-2-2"
+ y="291.59058"
+ x="-651.82935"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="291.59058"
+ x="-651.82935"
+ id="tspan12631-6-9-0-77-5"
+ sodipodi:role="line">B'</tspan></text>
+ </g>
+ <g
+ id="g14034-8">
+ <path
+ transform="matrix(0.33294398,0,0,0.48990327,-580.01,217.89561)"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ sodipodi:ry="100"
+ sodipodi:rx="147.14285"
+ sodipodi:cy="399.50504"
+ sodipodi:cx="-172.85715"
+ id="path12627-8-4-1-9-2-4"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <text
+ id="text12629-9-3-1-8-0-4"
+ y="428.25726"
+ x="-650.776"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="428.25726"
+ x="-650.776"
+ id="tspan12631-6-9-0-7-7-3"
+ sodipodi:role="line">A'</tspan></text>
+ </g>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ d="M 181.58323,227.00991 81.848934,356.84479"
+ id="path14087-4"
+ transform="translate(-848.99032,225.45742)"
+ inkscape:connector-type="polyline"
+ inkscape:connection-start="#g14034-8"
+ inkscape:connection-end="#g12957-3"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ d="m 211.42857,100.48065 0,38.68604"
+ id="path14089-8"
+ transform="translate(-848.99032,225.45742)"
+ inkscape:connector-type="polyline"
+ inkscape:connection-start="#g14080-8"
+ inkscape:connection-end="#g14034-8"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-start:none;marker-mid:none;marker-end:url(#EmptyDiamondMend)"
+ d="M 166.63618,208.02892 96.585,239.10674"
+ id="path14463-7"
+ transform="translate(-848.99032,225.45742)"
+ inkscape:connector-type="polyline"
+ inkscape:connection-start="#g14034-8"
+ inkscape:connection-end="#g12945-5"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-start:none;marker-mid:none;marker-end:url(#EmptyDiamondMend)"
+ d="M 166.63618,71.362225 97.512165,102.02871"
+ id="path14465-9"
+ inkscape:connector-type="polyline"
+ transform="translate(-848.99032,225.45742)"
+ inkscape:connection-end="#g12933-3"
+ inkscape:connection-start="#g14080-8"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <g
+ id="g5583"
+ transform="translate(-0.68341,0)">
+ <path
+ transform="matrix(0.33294398,0,0,0.48990327,-738.58143,1.22892)"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ sodipodi:ry="100"
+ sodipodi:rx="147.14285"
+ sodipodi:cy="399.50504"
+ sodipodi:cx="-172.85715"
+ id="path4918"
+ style="fill:#ff0000;fill-opacity:0;fill-rule:evenodd;stroke:#ff0000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <text
+ id="text4920"
+ y="211.59058"
+ x="-810.40076"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#ff0000;fill-opacity:1;stroke:#ff0000;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="211.59058"
+ x="-810.40076"
+ id="tspan4922"
+ sodipodi:role="line">C</tspan></text>
+ </g>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 52.173733,20.478573 0,50.004102"
+ id="path5588"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="3"
+ inkscape:connection-start="#g5583"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end="#g12933-3"
+ inkscape:connection-end-point="d4"
+ transform="translate(-848.99032,225.45742)" />
+ </g>
+ <text
+ id="text13902"
+ y="781.50439"
+ x="801.03363"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="781.50439"
+ x="801.03363"
+ id="tspan13904"
+ sodipodi:role="line">final = <tspan
+ id="tspan14035"
+ style="fill:#ff0000;stroke:#ff0000">instable</tspan></tspan></text>
+ </g>
+ <g
+ id="g14074"
+ transform="translate(12.068966,-361.47806)">
+ <g
+ id="g13288"
+ transform="translate(531.43821,-33.336839)">
+ <g
+ id="g12933"
+ transform="translate(0,5.2380981)">
+ <path
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,146.64336)"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ sodipodi:ry="100"
+ sodipodi:rx="147.14285"
+ sodipodi:cy="399.50504"
+ sodipodi:cx="-172.85715"
+ id="path12627-8-4-1"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <text
+ id="text12629-9-3-1"
+ y="357.005"
+ x="-811.76758"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="357.005"
+ x="-811.76758"
+ id="tspan12631-6-9-0"
+ sodipodi:role="line">B</tspan></text>
+ </g>
+ <g
+ id="g12945">
+ <path
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,288.54815)"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ sodipodi:ry="100"
+ sodipodi:rx="147.14285"
+ sodipodi:cy="399.50504"
+ sodipodi:cx="-172.85715"
+ id="path12627-8-4-1-9"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <text
+ id="text12629-9-3-1-8"
+ y="498.90979"
+ x="-810.71423"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="498.90979"
+ x="-810.71423"
+ id="tspan12631-6-9-0-7"
+ sodipodi:role="line">A</tspan></text>
+ </g>
+ <g
+ id="g12957">
+ <path
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,425.21479)"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ sodipodi:ry="100"
+ sodipodi:rx="147.14285"
+ sodipodi:cy="399.50504"
+ sodipodi:cx="-172.85715"
+ id="path12627-8-4-1-6"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <text
+ id="text12629-9-3-1-83"
+ y="635.57648"
+ x="-810.71423"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="635.57648"
+ x="-810.71423"
+ id="tspan12631-6-9-0-5"
+ sodipodi:role="line">Z</tspan></text>
+ </g>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ d="m -797.5,393.91867 0,41.35798"
+ id="path12950"
+ inkscape:connector-type="polyline"
+ inkscape:connection-start="#g12933"
+ inkscape:connection-end="#g12945" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ d="m -797.5,533.2573 0,38.68599"
+ id="path12962"
+ inkscape:connector-type="polyline"
+ inkscape:connection-start="#g12945"
+ inkscape:connection-end="#g12957" />
+ </g>
+ <text
+ id="text13906"
+ y="704.36151"
+ x="-321.08133"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="704.36151"
+ x="-321.08133"
+ id="tspan13908"
+ sodipodi:role="line">initial</tspan></text>
+ </g>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#Arrow1Mend)"
+ d="M -148.90439,71.107869 115.52431,-150.21739"
+ id="path14093" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#Arrow1Mend)"
+ d="M -116.60064,185.59571 141.08898,310.8959"
+ id="path14093-1" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#Arrow1Mend)"
+ d="m 377.16638,-147.48298 351.94233,55.511595"
+ id="path14093-4"
+ inkscape:transform-center-x="48.58484"
+ inkscape:transform-center-y="-19.640393" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:8.96527767;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none;marker-end:url(#Arrow1Mend)"
+ d="M 516.3549,303.21782 766.85794,121.81435"
+ id="path14093-42" />
+ </g>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/figures/explain-troubles-unstable-15-solution.svg Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,1006 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="637.31207"
+ height="614.44788"
+ id="svg12964"
+ version="1.1"
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="explain-troubles-unstable-15-solution.svg">
+ <defs
+ id="defs12966">
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Mend"
+ style="overflow:visible">
+ <path
+ id="path4078"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.4,0,0,-0.4,-4,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lend"
+ style="overflow:visible">
+ <path
+ id="path4072"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.8,0,0,-0.8,-10,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Lstart"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lstart"
+ style="overflow:visible">
+ <path
+ id="path4069"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.8,0,0,0.8,10,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective12972" />
+ <inkscape:perspective
+ id="perspective13312"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM"
+ style="overflow:visible">
+ <path
+ id="path6393"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13318"
+ style="overflow:visible">
+ <path
+ id="path13320"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ id="perspective13418"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-1"
+ style="overflow:visible">
+ <path
+ id="path6393-1"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13424"
+ style="overflow:visible">
+ <path
+ id="path13426"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13428"
+ style="overflow:visible">
+ <path
+ id="path13430"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13432"
+ style="overflow:visible">
+ <path
+ id="path13434"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="EmptyDiamondMend"
+ style="overflow:visible">
+ <path
+ id="path6456"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13438"
+ style="overflow:visible">
+ <path
+ id="path13440"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ id="perspective13583"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-0"
+ style="overflow:visible">
+ <path
+ id="path6393-5"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13589"
+ style="overflow:visible">
+ <path
+ id="path13591"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13593"
+ style="overflow:visible">
+ <path
+ id="path13595"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ id="perspective13743"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-2"
+ style="overflow:visible">
+ <path
+ id="path6393-2"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13749"
+ style="overflow:visible">
+ <path
+ id="path13751"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13753"
+ style="overflow:visible">
+ <path
+ id="path13755"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13757"
+ style="overflow:visible">
+ <path
+ id="path13759"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="EmptyDiamondMend-3"
+ style="overflow:visible">
+ <path
+ id="path6456-4"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13763"
+ style="overflow:visible">
+ <path
+ id="path13765"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ id="perspective15593"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lend-2"
+ style="overflow:visible">
+ <path
+ id="path4072-8"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.8,0,0,-0.8,-10,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ id="perspective15593-5"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lend-6"
+ style="overflow:visible">
+ <path
+ id="path4072-7"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.8,0,0,-0.8,-10,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ id="perspective15593-1"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lend-29"
+ style="overflow:visible">
+ <path
+ id="path4072-70"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.8,0,0,-0.8,-10,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-6"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path6393-3"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker8630"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path8632"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker8634"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path8636"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker8638"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path8640"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="EmptyDiamondMend-2"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path6456-7"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker8644"
+ style="overflow:visible">
+ <path
+ inkscape:connector-curvature="0"
+ id="path8646"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)" />
+ </marker>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.58"
+ inkscape:cx="446.08569"
+ inkscape:cy="388.21623"
+ inkscape:document-units="px"
+ inkscape:current-layer="g13702-1"
+ showgrid="false"
+ inkscape:window-width="1215"
+ inkscape:window-height="776"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ fit-margin-top="5"
+ fit-margin-right="5"
+ fit-margin-bottom="5"
+ fit-margin-left="5" />
+ <metadata
+ id="metadata12969">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-804.0536,336.234)">
+ <g
+ transform="translate(1656.9206,-399.73886)"
+ id="g13702">
+ <g
+ style="opacity:0.5"
+ transform="translate(0.68341,5.2381)"
+ id="g12933-3">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-5"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,146.64336)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-811.76758"
+ y="357.005"
+ id="text12629-9-3-1-28"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-73"
+ x="-811.76758"
+ y="357.005">B</tspan></text>
+ </g>
+ <g
+ transform="translate(0.68341,0)"
+ style="opacity:0.5"
+ id="g12945-5">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-9-8"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,288.54815)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-810.71423"
+ y="498.90979"
+ id="text12629-9-3-1-8-87"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-7-3"
+ x="-810.71423"
+ y="498.90979">A</tspan></text>
+ </g>
+ <g
+ transform="translate(0.68341,0)"
+ id="g12957-3">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-6-8"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,425.21479)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-810.71423"
+ y="635.57648"
+ id="text12629-9-3-1-83-5"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-5-4"
+ x="-810.71423"
+ y="635.57648">Z</tspan></text>
+ </g>
+ <path
+ inkscape:connector-curvature="0"
+ inkscape:connection-end-point="d4"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end="#g12945-5"
+ inkscape:connection-start="#g12933-3"
+ inkscape:connector-type="polyline"
+ id="path12950-85"
+ d="m -796.81659,393.9166 0,41.36212"
+ style="opacity:0.5;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)" />
+ <path
+ inkscape:connector-curvature="0"
+ inkscape:connection-end-point="d4"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end="#g12957-3"
+ inkscape:connection-start="#g12945-5"
+ inkscape:connector-type="polyline"
+ id="path12962-4"
+ d="m -796.81659,533.25522 0,38.69014"
+ style="opacity:0.5;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)" />
+ <g
+ id="g14080-8">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-67-4"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-580.01,81.22892)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-651.82935"
+ y="291.59058"
+ id="text12629-9-3-1-2-2"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-77-5"
+ x="-651.82935"
+ y="291.59058">B'</tspan></text>
+ </g>
+ <g
+ id="g14034-8">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-9-2-4"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-580.01,217.89561)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-650.776"
+ y="428.25726"
+ id="text12629-9-3-1-8-0-4"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-7-7-3"
+ x="-650.776"
+ y="428.25726">A'</tspan></text>
+ </g>
+ <path
+ inkscape:connector-curvature="0"
+ inkscape:connection-end-point="d4"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end="#g12957-3"
+ inkscape:connection-start="#g14034-8"
+ inkscape:connector-type="polyline"
+ transform="translate(-848.99032,225.45742)"
+ id="path14087-4"
+ d="M 181.58323,227.00991 81.848934,356.84479"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)" />
+ <path
+ inkscape:connector-curvature="0"
+ inkscape:connection-end-point="d4"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end="#g14034-8"
+ inkscape:connection-start="#g14080-8"
+ inkscape:connector-type="polyline"
+ transform="translate(-848.99032,225.45742)"
+ id="path14089-8"
+ d="m 211.42857,100.48065 0,38.68604"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)" />
+ <path
+ inkscape:connector-curvature="0"
+ inkscape:connection-end-point="d4"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end="#g12945-5"
+ inkscape:connection-start="#g14034-8"
+ inkscape:connector-type="polyline"
+ transform="translate(-848.99032,225.45742)"
+ id="path14463-7"
+ d="M 166.63618,208.02892 96.585,239.10674"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-start:none;marker-mid:none;marker-end:url(#EmptyDiamondMend)" />
+ <path
+ inkscape:connector-curvature="0"
+ inkscape:connection-end-point="d4"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-start="#g14080-8"
+ inkscape:connection-end="#g12933-3"
+ transform="translate(-848.99032,225.45742)"
+ inkscape:connector-type="polyline"
+ id="path14465-9"
+ d="M 166.63618,71.362225 97.512166,102.02872"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-start:none;marker-mid:none;marker-end:url(#EmptyDiamondMend)" />
+ <g
+ transform="translate(-0.68341,0)"
+ id="g5583">
+ <path
+ sodipodi:type="arc"
+ style="fill:#ff0000;fill-opacity:0;fill-rule:evenodd;stroke:#ff0000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path4918"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-738.58143,1.22892)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#ff0000;fill-opacity:1;stroke:#ff0000;font-family:Bitstream Vera Sans"
+ x="-810.40076"
+ y="211.59058"
+ id="text4920"><tspan
+ sodipodi:role="line"
+ id="tspan4922"
+ x="-810.40076"
+ y="211.59058">C</tspan></text>
+ </g>
+ <path
+ transform="translate(-848.99032,225.45742)"
+ inkscape:connection-end-point="d4"
+ inkscape:connection-end="#g12933-3"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-start="#g5583"
+ inkscape:connector-curvature="3"
+ inkscape:connector-type="polyline"
+ id="path5588"
+ d="m 52.173733,20.478573 0,50.004103"
+ style="opacity:0.98000004;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#marker8638)" />
+ </g>
+ <g
+ transform="translate(2022.8785,-401.87475)"
+ id="g13702-1">
+ <g
+ style="opacity:0.5"
+ transform="translate(0.68341,5.2381)"
+ id="g12933-3-2">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-5-9"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,146.64336)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-811.76758"
+ y="357.005"
+ id="text12629-9-3-1-28-1"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-73-6"
+ x="-811.76758"
+ y="357.005">B</tspan></text>
+ </g>
+ <g
+ transform="translate(0.68341,0)"
+ style="opacity:0.5"
+ id="g12945-5-4">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-9-8-0"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,288.54815)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-810.71423"
+ y="498.90979"
+ id="text12629-9-3-1-8-87-7"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-7-3-6"
+ x="-810.71423"
+ y="498.90979">A</tspan></text>
+ </g>
+ <g
+ transform="translate(0.68341,0)"
+ id="g12957-3-9">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-6-8-4"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,425.21479)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-810.71423"
+ y="635.57648"
+ id="text12629-9-3-1-83-5-9"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-5-4-8"
+ x="-810.71423"
+ y="635.57648">Z</tspan></text>
+ </g>
+ <path
+ inkscape:connector-curvature="0"
+ inkscape:connection-end-point="d4"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end="#g12945-5-4"
+ inkscape:connection-start="#g12933-3-2"
+ inkscape:connector-type="polyline"
+ id="path12950-85-4"
+ d="m -796.81659,393.9166 0,41.36212"
+ style="opacity:0.5;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)" />
+ <path
+ inkscape:connector-curvature="0"
+ inkscape:connection-end-point="d4"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end="#g12957-3-9"
+ inkscape:connection-start="#g12945-5-4"
+ inkscape:connector-type="polyline"
+ id="path12962-4-3"
+ d="m -796.81659,533.25522 0,38.69014"
+ style="opacity:0.5;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)" />
+ <g
+ id="g14080-8-5">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-67-4-3"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-580.01,81.22892)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-651.82935"
+ y="291.59058"
+ id="text12629-9-3-1-2-2-5"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-77-5-6"
+ x="-651.82935"
+ y="291.59058">B'</tspan></text>
+ </g>
+ <g
+ id="g14034-8-4">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-9-2-4-3"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-580.01,217.89561)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-650.776"
+ y="428.25726"
+ id="text12629-9-3-1-8-0-4-6"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-7-7-3-3"
+ x="-650.776"
+ y="428.25726">A'</tspan></text>
+ </g>
+ <path
+ inkscape:connector-curvature="0"
+ inkscape:connection-end-point="d4"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end="#g12957-3-9"
+ inkscape:connection-start="#g14034-8-4"
+ inkscape:connector-type="polyline"
+ transform="translate(-848.99032,225.45742)"
+ id="path14087-4-0"
+ d="M 181.58323,227.00991 81.848934,356.84479"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)" />
+ <path
+ inkscape:connector-curvature="0"
+ inkscape:connection-end-point="d4"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end="#g14034-8-4"
+ inkscape:connection-start="#g14080-8-5"
+ inkscape:connector-type="polyline"
+ transform="translate(-848.99032,225.45742)"
+ id="path14089-8-4"
+ d="m 211.42857,100.48065 0,38.68604"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)" />
+ <path
+ inkscape:connector-curvature="0"
+ inkscape:connection-end-point="d4"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end="#g12945-5-4"
+ inkscape:connection-start="#g14034-8-4"
+ inkscape:connector-type="polyline"
+ transform="translate(-848.99032,225.45742)"
+ id="path14463-7-3"
+ d="M 166.63618,208.02892 96.585,239.10674"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-start:none;marker-mid:none;marker-end:url(#EmptyDiamondMend)" />
+ <path
+ inkscape:connector-curvature="0"
+ inkscape:connection-end-point="d4"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-start="#g14080-8-5"
+ inkscape:connection-end="#g12933-3-2"
+ transform="translate(-848.99032,225.45742)"
+ inkscape:connector-type="polyline"
+ id="path14465-9-9"
+ d="M 166.63618,71.362225 97.512166,102.02872"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-start:none;marker-mid:none;marker-end:url(#EmptyDiamondMend)" />
+ <g
+ transform="translate(-0.68341,0)"
+ id="g5583-2"
+ style="opacity:0.5;fill:#000000;stroke:#000000">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path4918-6"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-738.58143,1.22892)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:#000000;font-family:Bitstream Vera Sans"
+ x="-810.40076"
+ y="211.59058"
+ id="text4920-1"><tspan
+ sodipodi:role="line"
+ id="tspan4922-9"
+ x="-810.40076"
+ y="211.59058">C</tspan></text>
+ </g>
+ <path
+ transform="translate(-848.99032,225.45742)"
+ inkscape:connection-end-point="d4"
+ inkscape:connection-end="#g12933-3-2"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-start="#g5583-2"
+ inkscape:connector-curvature="3"
+ inkscape:connector-type="polyline"
+ id="path5588-9"
+ d="m 52.173733,20.478573 0,50.004103"
+ style="opacity:0.5;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#marker8638)" />
+ <g
+ transform="translate(-4.5930013,-154.28292)"
+ id="g14080-8-5-0"
+ style="fill:#0000ff;stroke:#0000ff">
+ <path
+ sodipodi:type="arc"
+ style="fill:#0000ff;fill-opacity:0;fill-rule:evenodd;stroke:#0000ff;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-67-4-3-2"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-580.01,81.22892)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#0000ff;fill-opacity:1;stroke:#0000ff;font-family:Bitstream Vera Sans"
+ x="-651.82935"
+ y="291.59058"
+ id="text12629-9-3-1-2-2-5-5"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-77-5-6-1"
+ x="-651.82935"
+ y="291.59058">C'</tspan></text>
+ </g>
+ </g>
+ <path
+ style="fill:#0000ff;stroke:#0000ff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#marker8638)"
+ d="m 1380.7238,-230.93407 0,58.53617"
+ id="path9998"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3, 3;stroke-dashoffset:0;marker-end:url(#marker8644)"
+ d="m 1653.4483,189.643 -63.7931,37.93103"
+ id="path10000"
+ inkscape:connector-curvature="0"
+ transform="translate(-317.55211,-451.61155)" />
+ </g>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/figures/git.svg Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,863 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="910.36212"
+ height="598.43103"
+ id="svg12964"
+ version="1.1"
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="git.svg">
+ <defs
+ id="defs12966">
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Mend"
+ style="overflow:visible">
+ <path
+ id="path4078"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.4,0,0,-0.4,-4,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lend"
+ style="overflow:visible">
+ <path
+ id="path4072"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.8,0,0,-0.8,-10,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Lstart"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lstart"
+ style="overflow:visible">
+ <path
+ id="path4069"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.8,0,0,0.8,10,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective12972" />
+ <inkscape:perspective
+ id="perspective13312"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM"
+ style="overflow:visible">
+ <path
+ id="path6393"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13318"
+ style="overflow:visible">
+ <path
+ id="path13320"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ id="perspective13418"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-1"
+ style="overflow:visible">
+ <path
+ id="path6393-1"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13424"
+ style="overflow:visible">
+ <path
+ id="path13426"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13428"
+ style="overflow:visible">
+ <path
+ id="path13430"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13432"
+ style="overflow:visible">
+ <path
+ id="path13434"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="EmptyDiamondMend"
+ style="overflow:visible">
+ <path
+ id="path6456"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13438"
+ style="overflow:visible">
+ <path
+ id="path13440"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ id="perspective13583"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-0"
+ style="overflow:visible">
+ <path
+ id="path6393-5"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13589"
+ style="overflow:visible">
+ <path
+ id="path13591"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13593"
+ style="overflow:visible">
+ <path
+ id="path13595"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ id="perspective13743"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="DotM-2"
+ style="overflow:visible">
+ <path
+ id="path6393-2"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13749"
+ style="overflow:visible">
+ <path
+ id="path13751"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13753"
+ style="overflow:visible">
+ <path
+ id="path13755"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="DotM"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13757"
+ style="overflow:visible">
+ <path
+ id="path13759"
+ d="m -2.5,-1 c 0,2.76 -2.24,5 -5,5 -2.76,0 -5,-2.24 -5,-5 0,-2.76 2.24,-5 5,-5 2.76,0 5,2.24 5,5 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+ transform="matrix(0.4,0,0,0.4,2.96,0.4)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="EmptyDiamondMend-3"
+ style="overflow:visible">
+ <path
+ id="path6456-4"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <marker
+ inkscape:stockid="EmptyDiamondMend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker13763"
+ style="overflow:visible">
+ <path
+ id="path13765"
+ d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 z"
+ style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(0.4,0,0,0.4,-2.6,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ id="perspective15593"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lend-2"
+ style="overflow:visible">
+ <path
+ id="path4072-8"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.8,0,0,-0.8,-10,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ id="perspective15593-5"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lend-6"
+ style="overflow:visible">
+ <path
+ id="path4072-7"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.8,0,0,-0.8,-10,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ <inkscape:perspective
+ id="perspective15593-1"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="Arrow1Lend-29"
+ style="overflow:visible">
+ <path
+ id="path4072-70"
+ d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+ transform="matrix(-0.8,0,0,-0.8,-10,0)"
+ inkscape:connector-curvature="0" />
+ </marker>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.7"
+ inkscape:cx="267.70686"
+ inkscape:cy="266.91354"
+ inkscape:document-units="px"
+ inkscape:current-layer="g13382"
+ showgrid="false"
+ inkscape:window-width="1280"
+ inkscape:window-height="776"
+ inkscape:window-x="0"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ fit-margin-top="5"
+ fit-margin-bottom="5"
+ fit-margin-right="5"
+ fit-margin-left="5" />
+ <metadata
+ id="metadata12969">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-120.93016,350.21716)">
+ <g
+ id="g16677"
+ transform="translate(-83.33333,-403.33333)">
+ <g
+ transform="translate(63.770124,322.85714)"
+ id="g13934">
+ <g
+ transform="translate(994.04378,-358.66548)"
+ id="g13382">
+ <g
+ style="opacity:0.5"
+ transform="translate(0,5.2380981)"
+ id="g12933-9">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-8"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,146.64336)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-811.76758"
+ y="357.005"
+ id="text12629-9-3-1-4"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-9"
+ x="-811.76758"
+ y="357.005">B</tspan></text>
+ </g>
+ <g
+ style="opacity:0.5"
+ id="g12945-3">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-9-9"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,288.54815)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-810.71423"
+ y="498.90979"
+ id="text12629-9-3-1-8-9"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-7-0"
+ x="-810.71423"
+ y="498.90979">A</tspan></text>
+ </g>
+ <g
+ id="g12957-8">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-6-3"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,425.21479)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-810.71423"
+ y="635.57648"
+ id="text12629-9-3-1-83-0"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-5-1"
+ x="-810.71423"
+ y="635.57648">Z</tspan></text>
+ </g>
+ <path
+ inkscape:connector-type="polyline"
+ id="path12950-7"
+ d="m -797.5,393.91867 0,41.35798"
+ style="opacity:0.5;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ inkscape:connector-curvature="0"
+ inkscape:connection-end-point="d4"
+ inkscape:connection-end="#g12945-3"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-start="#g12933-9" />
+ <path
+ inkscape:connector-type="polyline"
+ id="path12962-0"
+ d="m -797.5,533.2573 0,38.68599"
+ style="opacity:0.5;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ inkscape:connector-curvature="0"
+ inkscape:connection-end-point="d4"
+ inkscape:connection-end="#g12957-8"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-start="#g12945-3" />
+ <g
+ id="g14080">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-67"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-580.01,81.22892)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-651.82935"
+ y="291.59058"
+ id="text12629-9-3-1-2"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-77"
+ x="-651.82935"
+ y="291.59058">B'</tspan></text>
+ </g>
+ <g
+ id="g14034">
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ id="path12627-8-4-1-9-2"
+ sodipodi:cx="-172.85715"
+ sodipodi:cy="399.50504"
+ sodipodi:rx="147.14285"
+ sodipodi:ry="100"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ transform="matrix(0.33294398,0,0,0.48990327,-580.01,217.89561)" />
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="-650.776"
+ y="428.25726"
+ id="text12629-9-3-1-8-0"><tspan
+ sodipodi:role="line"
+ id="tspan12631-6-9-0-7-7"
+ x="-650.776"
+ y="428.25726">A'</tspan></text>
+ </g>
+ <path
+ inkscape:connector-type="polyline"
+ transform="translate(-848.99032,225.45742)"
+ id="path14087"
+ d="M 181.50292,226.948 81.415976,356.68521"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ inkscape:connector-curvature="0"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-start="#g14034"
+ inkscape:connection-end-point="d4"
+ inkscape:connection-end="#g12957-8" />
+ <path
+ inkscape:connector-type="polyline"
+ transform="translate(-848.99032,225.45742)"
+ id="path14089"
+ d="m 211.42857,100.48065 0,38.68604"
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ inkscape:connector-curvature="0"
+ inkscape:connection-end-point="d4"
+ inkscape:connection-end="#g14034"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-start="#g14080" />
+ </g>
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ x="224.57932"
+ y="372.93292"
+ id="text13894"><tspan
+ sodipodi:role="line"
+ id="tspan13896"
+ x="224.57932"
+ y="372.93292" /></text>
+ </g>
+ </g>
+ <g
+ id="g14037"
+ transform="translate(-209.2775,-468.21686)">
+ <g
+ id="g13702"
+ transform="translate(1669.5314,38.478002)">
+ <g
+ id="g12933-3"
+ transform="translate(0.68341,5.2381)">
+ <path
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,146.64336)"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ sodipodi:ry="100"
+ sodipodi:rx="147.14285"
+ sodipodi:cy="399.50504"
+ sodipodi:cx="-172.85715"
+ id="path12627-8-4-1-5"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <text
+ id="text12629-9-3-1-28"
+ y="357.005"
+ x="-811.76758"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="357.005"
+ x="-811.76758"
+ id="tspan12631-6-9-0-73"
+ sodipodi:role="line">B</tspan></text>
+ </g>
+ <g
+ id="g12945-5"
+ transform="translate(0.68341,0)">
+ <path
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,288.54815)"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ sodipodi:ry="100"
+ sodipodi:rx="147.14285"
+ sodipodi:cy="399.50504"
+ sodipodi:cx="-172.85715"
+ id="path12627-8-4-1-9-8"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <text
+ id="text12629-9-3-1-8-87"
+ y="498.90979"
+ x="-810.71423"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="498.90979"
+ x="-810.71423"
+ id="tspan12631-6-9-0-7-3"
+ sodipodi:role="line">A</tspan></text>
+ </g>
+ <g
+ id="g12957-3"
+ transform="translate(0.68341,0)">
+ <path
+ transform="matrix(0.33294398,0,0,0.48990327,-739.94825,425.21479)"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ sodipodi:ry="100"
+ sodipodi:rx="147.14285"
+ sodipodi:cy="399.50504"
+ sodipodi:cx="-172.85715"
+ id="path12627-8-4-1-6-8"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <text
+ id="text12629-9-3-1-83-5"
+ y="635.57648"
+ x="-810.71423"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="635.57648"
+ x="-810.71423"
+ id="tspan12631-6-9-0-5-4"
+ sodipodi:role="line">Z</tspan></text>
+ </g>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ d="m -796.81659,393.9166 0,41.36212"
+ id="path12950-85"
+ inkscape:connector-type="polyline"
+ inkscape:connection-start="#g12933-3"
+ inkscape:connection-end="#g12945-5"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:#000000;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ d="m -796.81659,533.25522 0,38.69014"
+ id="path12962-4"
+ inkscape:connector-type="polyline"
+ inkscape:connection-start="#g12945-5"
+ inkscape:connection-end="#g12957-3"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0" />
+ <g
+ id="g14080-8">
+ <path
+ transform="matrix(0.33294398,0,0,0.48990327,-580.01,81.22892)"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ sodipodi:ry="100"
+ sodipodi:rx="147.14285"
+ sodipodi:cy="399.50504"
+ sodipodi:cx="-172.85715"
+ id="path12627-8-4-1-67-4"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <text
+ id="text12629-9-3-1-2-2"
+ y="291.59058"
+ x="-651.82935"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="291.59058"
+ x="-651.82935"
+ id="tspan12631-6-9-0-77-5"
+ sodipodi:role="line">B'</tspan></text>
+ </g>
+ <g
+ id="g14034-8">
+ <path
+ transform="matrix(0.33294398,0,0,0.48990327,-580.01,217.89561)"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ sodipodi:ry="100"
+ sodipodi:rx="147.14285"
+ sodipodi:cy="399.50504"
+ sodipodi:cx="-172.85715"
+ id="path12627-8-4-1-9-2-4"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <text
+ id="text12629-9-3-1-8-0-4"
+ y="428.25726"
+ x="-650.776"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="428.25726"
+ x="-650.776"
+ id="tspan12631-6-9-0-7-7-3"
+ sodipodi:role="line">A'</tspan></text>
+ </g>
+ <path
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ d="M 181.58323,227.00991 81.848934,356.84479"
+ id="path14087-4"
+ inkscape:connector-type="polyline"
+ inkscape:connection-start="#g14034-8"
+ inkscape:connection-end="#g12957-3"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0"
+ transform="translate(-848.99032,225.45742)" />
+ <path
+ style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:url(#DotM)"
+ d="m 211.42857,100.48065 0,38.68604"
+ id="path14089-8"
+ inkscape:connector-type="polyline"
+ inkscape:connection-start="#g14080-8"
+ inkscape:connection-end="#g14034-8"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end-point="d4"
+ inkscape:connector-curvature="0"
+ transform="translate(-848.99032,225.45742)" />
+ <g
+ id="g5583"
+ transform="translate(-0.68341,0)"
+ style="fill:#000000;stroke:#000000">
+ <path
+ transform="matrix(0.33294398,0,0,0.48990327,-738.58143,1.22892)"
+ d="m -25.714294,399.50504 c 0,55.22847 -65.8781,100 -147.142856,100 -81.26475,0 -147.14285,-44.77153 -147.14285,-100 0,-55.22848 65.8781,-100 147.14285,-100 81.264756,0 147.142856,44.77152 147.142856,100 z"
+ sodipodi:ry="100"
+ sodipodi:rx="147.14285"
+ sodipodi:cy="399.50504"
+ sodipodi:cx="-172.85715"
+ id="path4918"
+ style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:#000000;stroke-width:12.38024521;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ sodipodi:type="arc" />
+ <text
+ id="text4920"
+ y="211.59058"
+ x="-810.40076"
+ style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:#000000;font-family:Bitstream Vera Sans"
+ xml:space="preserve"><tspan
+ y="211.59058"
+ x="-810.40076"
+ id="tspan4922"
+ sodipodi:role="line">C</tspan></text>
+ </g>
+ <path
+ style="fill:#000000;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 52.173733,20.478573 0,50.004103"
+ id="path5588"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="3"
+ inkscape:connection-start="#g5583"
+ inkscape:connection-start-point="d4"
+ inkscape:connection-end="#g12933-3"
+ inkscape:connection-end-point="d4"
+ transform="translate(-848.99032,225.45742)" />
+ </g>
+ </g>
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="199.11453"
+ y="-241.73866"
+ id="text17638"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan17640"
+ x="199.11453"
+ y="-241.73866"
+ style="fill:#0000ff;stroke:#0000ff">feature-babar</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="531.01886"
+ y="-314.82654"
+ id="text17638-9"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan17640-9"
+ x="531.01886"
+ y="-314.82654"
+ style="fill:#0000ff;stroke:#0000ff"><tspan
+ style="fill:#008000;stroke:#008000"
+ id="tspan17684">other/</tspan>feature-babar</tspan></text>
+ <text
+ xml:space="preserve"
+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+ x="751.01886"
+ y="-222.82655"
+ id="text17638-9-2"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan17640-9-8"
+ x="751.01886"
+ y="-222.82655"
+ style="fill:#0000ff;stroke:#0000ff">feature-babar</tspan></text>
+ </g>
+</svg>
Binary file docs/figures/hgview-example.png has changed
--- a/docs/from-mq.rst Thu Aug 23 18:09:45 2012 +0200
+++ b/docs/from-mq.rst Thu Jun 26 15:27:25 2014 +0100
@@ -1,3 +1,6 @@
+.. Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org>
+.. Logilab SA <contact@logilab.fr>
+
-------------------------------------------
From MQ To Evolve, The Refugee Book
-------------------------------------------
@@ -11,11 +14,13 @@
qseries ``log``
qnew ``commit``
qrefresh ``amend``
-qpop ``update`` or ``qdown``
-qpush ``update`` or ``gup`` sometimes ``stabilize``
+qrefresh --exclude ``uncommit``
+qpop ``update`` or ``gdown``
+qpush ``update`` or ``gup`` sometimes ``evolve``
qrm ``prune``
-qfold ``amend -c`` (for now, ``collapse`` soon)
+qfold ``fold``
qdiff ``odiff``
+qrecord ``record``
qfinish --
qimport --
@@ -34,7 +39,7 @@
phase revset to display unfinished work only, and use templates to have
the same kind of compact that the output of qseries has.
-This will result in something like that::
+This will result in something like::
[alias]
wip = log -r 'not public()' --template='{rev}:{node|short} {desc|firstline}\n'
@@ -44,7 +49,7 @@
With evolve you handle standard changesets without an additional overlay.
-Standard changeset are created using hg commit as usual.::
+Standard changeset are created using hg commit as usual::
$ hg commit
@@ -52,7 +57,7 @@
set your changeset in the secret phase using the phase command.
Note that you only need it for the first commit you want to be secret. Later
-commits will inherit their parents phase.
+commits will inherit their parent's phase.
If you always want your new commit to be in the secret phase, your should
consider updating your configuration:
@@ -71,20 +76,23 @@
This command takes the same options as commit, plus the switch '-e' (--edit)
to edit the commit message in an editor.
-The amend command also has a -c switch which allow you to make an
-explicit amending commit before rewriting a changeset.::
- $ hg record -m 'feature A'
- # oups, I forget some stuff
- $ hg record babar.py
- $ hg amend -c .^ # .^ refer to "working directoy parent, here 'feature A'
+.. -c is very confusig
+..
+.. The amend command also has a -c switch which allows you to make an
+.. explicit amending commit before rewriting a changeset.::
+..
+.. $ hg record -m 'feature A'
+.. # oups, I forgot some stuff
+.. $ hg record babar.py
+.. $ hg amend -c .^ # .^ refer to "working directoy parent, here 'feature A'
-note: refresh is an alias for amend
+.. note: refresh is an alias for amend
-hg qref -X
-````````````
+hg qref --exclude
+`````````````````````
-To remove change from you current commit use::
+To remove changes from your current commit use::
$ hg uncommit not-ready.txt
@@ -92,7 +100,7 @@
hg qpop
`````````
-The following command emulate the behavior of hg qpop:
+The following command emulates the behavior of hg qpop:
$ hg gdown
@@ -100,20 +108,20 @@
$ hg update
-.. note:: gdown and update allow movement with working directory changes applied
- and gracefully merge them.
+.. note:: gdown and update allow movement with working directory
+ changes applied, and gracefully merge them.
hg qpush
````````
When you rewrite changesets, descendants of rewritten changesets are marked as
-"out of sync". You need to rewrite them on top of the new version of their
+"unstable". You need to rewrite them on top of the new version of their
ancestor.
-The evolution extension adds a command to rewrite the "out of sync"
+The evolution extension adds a command to rewrite "unstable"
changesets:::
- $ hg stabilize
+ $ hg evolve
You can also decide to do it manually using::
@@ -140,28 +148,20 @@
::
- $ hg up <top changeset>
- $ amend --edit -c <bottom changeset>
-
-
-or later::
-
- $ hg collapse # XXX not implemented
- $ hg rebase --collapse # XXX not tested
-
+ $ hg fold first::last
hg qdiff
`````````
-``odiff`` is an alias for `hg diff -r .^` it works as qdiff, but outside mq.
+``pdiff`` is an alias for `hg diff -r .^` It works like qdiff, but outside MQ.
hg qfinish and hg qimport
````````````````````````````
-These are not necessary anymore. If you want to control exchange and
-mutability of changesets, see the phase feature
+These are not necessary anymore. If you want to control the
+mutability of changesets, see the phase feature.
--- a/docs/index.rst Thu Aug 23 18:09:45 2012 +0200
+++ b/docs/index.rst Thu Jun 26 15:27:25 2014 +0100
@@ -1,12 +1,22 @@
+.. Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org>
+.. Logilab SA <contact@logilab.fr>
+
========================================
-Safe Mutable History
+Changeset Evolution Experimentation
========================================
+This is the online documentation of the `evolve extension`_. An experimental
+extension that drive the implementation of the `changeset evolution concept`_ for
+Mercurial.
+
+.. _`evolve extension`: http://mercurial.selenic.com/wiki/EvolveExtension
+.. _`changeset evolution concept`: http://mercurial.selenic.com/wiki/ChangesetEvolution
+
Here are various materials on planned improvement to Mercurial regarding
rewriting history.
-First read about what challenge arise while rewriting history and how we plan to
+First, read about what challenges arise while rewriting history and how we plan to
solve them once and for all.
.. toctree::
@@ -16,13 +26,14 @@
The effort is split in two parts:
- * The **obsolete marker** concept aims to provide an alternative to ``strip``
- to get rid of changesets.
+ * The **obsolescence marker** concept aims to provide an alternative to ``strip``
+ to get rid of changesets. This concept has been partially implemented since
+ Mercurial 2.3.
- * The **evolve** mercurial extension rewrites history using obsolete
+ * The **evolve** Mercurial extension rewrites history using obsolete
*marker* under the hood.
-The first and most important step is by far the **obsolete marker**. However
+The first and most important step is by far the **obsolescence marker**. However
most users will never be directly exposed to the concept. For this reason
this manual starts with changeset evolution.
@@ -30,62 +41,66 @@
====================================
Evolve is an experimental history rewriting extension that uses obsolete
-markers. It is inspired from MQ and pbranch but have multiple advantages over
+markers. It is inspired by MQ and pbranch but has multiple advantages over
them:
* Focus on your current work.
You can focus your work on a single changeset and take care of adapting
- descendent changeset later.
+ descendent changesets later.
* Handle **non-linear history with branches and merges**
-* Rely internally on **robust merge** mechanism of mercurial.
+* Rely internally on Mercurial's **robust merge** mechanism.
- Simple conflict are handled by real merge tools using appropriate ancestor.
- Conflict are much rarer and much more user friendly.
+ Simple conflicts are handled by real merge tools using the appropriate ancestor.
+ Conflicts are much rarer and much more user friendly.
* Mutable history **fully available all the time**.
- always use 'hg update' and forget about (un)applying patches to access the
+ Always use 'hg update' and forget about (un)applying patches to access the
mutable part of your history.
-* Use only **plain changeset** and forget about patches. Evole will create and
+* Use only **plain changesets** and forget about patches. Evolve will create and
exchange real changesets. Mutable history can be used in all usual operations:
pull, push, log, diff, etc.
-* Allow **sharing and collaboration** mutable history without fear of duplicate
+* Allow **sharing and collaboration** mutable history without fear of duplicates
(thanks to obsolete marker).
-* Cover all mq usage but guard.
+* Cover all MQ usage but guard.
+
+.. warning:: The evolve extension and obsolete markers are at an experimental
+ stage. While using obsolete you willl likely be exposed to complex
+ implications of the **obsolete marker** concept. I do not recommend
+ non-power users to test this at this stage.
-.. warning:: The evolve extention and the obsolete marker are at an experimental
- stage. While using obsolete you'll likely be exposed to complex
- implication of the **obsolete marker** concept. I do not recommend
- non-power user to test this at this stage.
+ While numbered 1.0.0, the command line API of this version should
+ **not** be regarded as *stable*: command behavior, name and
+ options may change in future releases or once integrated into
+ Mercurial. It is still an immature extension; a lot of
+ features are still missing but there is low risk of
+ repository corruption.
- XXX make sure to read the XXX section before using it.
+ Production-ready version should hide such details from normal users.
- Production ready version should hide such details to normal user.
+The evolve extension requires Mercurial 2.5 (older versions supports down to 2.2)
To enable the evolve extension use::
$ hg clone https://bitbucket.org/marmoute/mutable-history -u stable
- $ mutable-history/enable.sh >> ~/.hgrc
-
-You will probably want to use the associated version of hgview (qt viewer
-recommended). ::
+ $ echo '[extensions]\nevolve=$PWD/mutable-history/hgext/evolve.py' >> ~/.hgrc
- $ hg clone http://hg-lab.logilab.org/wip/hgview/ -u obsolete
- $ cd hgview
- $ python setup.py install --user
+You will probably want to use hgview_ to visualize obsolescence. Version 1.7.1
+or later is required.
-Works with mercurial 2.2
+.. _hgview: http://www.logilab.org/project/hgview/
+
---
-For more information see documents below:
+For more information see the documents below:
.. toctree::
:maxdepth: 1
@@ -100,27 +115,27 @@
Smart changeset deletion: Obsolete Marker
==========================================
-Obsolete marker is a powerful concept that allow mercurial to safely handle
+The obsolete marker is a powerful concept that allows Mercurial to safely handle
history rewriting operations. It is a new type of relation between Mercurial
-changesets that track the result of history rewriting operations.
+changesets that tracks the result of history rewriting operations.
-This concept is simple to define and provides a very solid base to:
+This concept is simple to define and provides a very solid base for:
-- Very fast history rewriting operations,
+- very fast history rewriting operations
-- auditable and reversible history rewriting process,
+- auditable and reversible history rewriting process
-- clean final history,
+- clean final history
-- share and collaborate on mutable parts of the history,
+- share and collaborate on mutable parts of the history
-- gracefully handle history rewriting conflicts,
+- gracefully handle history rewriting conflicts
-- allow various history rewriting UI to collaborate with a underlying common API.
+- allow various history rewriting UI to collaborate with a underlying common API
---
-For more information see documents below
+For more information, see the documents below
.. toctree::
:maxdepth: 1
@@ -128,39 +143,24 @@
obs-concept
obs-terms
obs-implementation
- obs-road-map
-
-
-Known limitation and bug
-=================================
-
-Here is a list of know issue that will be fixed later:
-* ``hg stabilize`` does not handle merge conflict.
-
- You must fallback to graft or rebase when that happen.
+Known limitations and bugs
+=================================
-* rewriting conflict are not detected yet``hg stabilize`` does not
- handle them.
+Here is a list of known issues that will be fixed later:
-* ``hg update`` can move an obsolete parent
-* you need to provide to `graft --continue -O` if you started you
+* You need to provide to `graft --continue -O` if you started you
graft using `-O`.
-* ``hg merge`` considers an extinct head to be a valid target, hence requiring
you to manually specify target all the time.
-* trying to exchange obsolete marker with a static http repo will crash.
-
-* trying to exchange a lot of obsolete markers through http crash.
-
-* Extinct changesets are turned secret by various commands.
+* Trying to exchange obsolete marker with a static http repo will crash.
* Extinct changesets are hidden using the *hidden* feature of mercurial only
supported by a few commands.
- Only ``hg log``, ``hgview`` and `hg glog` support it. ``hg head`` or other visual viewer don't.
+ Only ``hg log``, ``hgview`` and `hg glog` support it. Neither ``hg heads`` nor other visual viewers do.
-* hg heads show extinct changeset
+* hg heads shows extinct changesets.
--- a/docs/instability.rst Thu Aug 23 18:09:45 2012 +0200
+++ b/docs/instability.rst Thu Jun 26 15:27:25 2014 +0100
@@ -1,3 +1,5 @@
+.. Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org>
+.. Logilab SA <contact@logilab.fr>
-----------------------------------
The instability Principle
@@ -10,7 +12,7 @@
XXX starts by talking about getting ride of changeset.
-DVCSes bring two new major concepts to the Version Control Scene:
+DVCSes bring two new major concepts to the version control scene:
* History is organized as a robust DAG,
* History can be rewritten.
@@ -21,47 +23,46 @@
* Full snapshot of the versioned content,
* Reference to the previous full snapshot used to build the new one,
- * A description of the change who lead from the old content to the new old.
+ * A description of the change which leads from the old content to the new content.
-All three elements are to compute a *unique* hash that identify the changeset
+All three elements are used to compute a *unique* hash that identifies the changeset
(with various other metadata). This identification is a key part of DVCS design.
-This is a very useful property because Changing B parent means
-changing B content too. This requires the creation of **another**
+This is a very useful property because changing B's parent means
+changing B's content too. This requires the creation of **another**
changeset, which is semantically good.
-::
+.. figure:: ./figures/edit-is-rewrite-step2.svg
- Schema base, A, B and B'
To avoid duplication, the older changeset is usually discarded from accessible
history. I'm calling them *obsolete* changesets.
-But rewriting a changeset with children does not change these
-children's parent! And because children of the rewritten changeset
-still **depend** on the older "dead" version of the changeset with
-can not get rid of this dead version.
+But rewriting a changeset with children does not change the
+children's parents! And because children of the rewritten changeset
+still **depend** on the older "dead" version of the changeset, we
+cannot get rid of this dead version.
::
Schema base, A and A' and B.
I'm calling these children **unstable** because they are based on a
-dead changeset and prevent people to get rid of it.
+dead changeset and prevent people from getting rid of it.
This instability is an **unavoidable consequence** of the strict dependency of
-changeset. History Rewriting history alway need to take it in account and
-provide a way to rewrite the descendant on the new changeset to avoid
-coexistence of the old and new version of a rewritten changeset.
+changesets. Rewriting history always needs to take it into account and
+provide a way to rewrite the descendants of the new changeset to avoid
+coexistence of the old and new versions of a rewritten changeset.
Everybody is working around the issue
------------------------------------------------
-I'm not claiming that rewriting history is impossible. People are successfully
-doing for years. However they all need to work around *instability*. Several
-work around strategy exists.
+I'm not claiming that rewriting history is impossible. People have been successfully
+doing it for years. However they all need to work around *instability*. Several
+workaround strategies exist.
Rewriting all at once
@@ -78,17 +79,17 @@
Schema!
Several Mercurial commands apply it: rebase, collapse, histedit.
-Mercurial also refuses to amend changeset with descendant. The git
-branch design enforces such approach in git too.
+Mercurial also refuses to amend changesets with descendants. The git
+branch design enforces this approach in git too.
-However, DVCS are **Distributed**. This means that you do not control what
-happen outside your repository. Once a changeset have been exchanged *outside*,
+However, DVCS are **distributed**. This means that you do not control what
+happens outside your repository. Once a changeset has been exchanged *outside*,
there is no way to be sure it does not have descendants somewhere else.
Therefore **if you rewrite changeset that exists elsewhere, you can't eradicate
the risk of instability.**
-Do not rewrite exchanged changeset
+Do not rewrite exchanged changesets
```````````````````````````````````
To work around the issue above, Mercurial introduced phases, which
@@ -98,13 +99,13 @@
collaborating on mutable changesets.
In the Git world, they use another approach to prevent instability. By
-convention only a single developper works on a changeset contained in
+convention only a single developer works on a changeset contained in
a named branch. But once again this is a huge blocker for
collaborating. Moreover clueless people **will** mess up social
convention soon or later.
-Loose the DAG robustness
+Lose the DAG robustness
````````````````````````````
The other approach in Mercurial is to keep the mutable part of the
@@ -114,15 +115,15 @@
This allow much more flexible workflow but two major feature are lost in the
process:
-:Graceful merge: MQ use plain-patch to store changeset content and patch have
- trouble to apply in changing context. Applying your queue
+:graceful merge: MQ uses plain patch to store changeset contents, which has
+ problems in changing context. Applying your queue
becomes very painful when context changes.
-:easy branching: A quilt queue is by definition a linear queue. Increasing risk
- of conflict
+:easy branching: A quilt queue is by definition a linear queue, increasing risk
+ of conflict.
-It is possible to collaborate over versioned mq! But you are going to
-have a lot of troubles.
+It is possible to collaborate over versioned MQ! But you are going to
+have a lot of trouble.
Ignore conflicts
```````````````````````````````````
@@ -136,28 +137,28 @@
The "One set of mutable changset == One developer" mantra is also a way to work
around conflicting rewriting of changeset. If two different people are able to
-The git branch model allow to overwrite changeset version by another
+The git branch model allows overwriting changeset version by another
one, but it does not care about divergent version. It is the equivalent
of "common ftp" source management for changesets.
Facing The Danger Once And For All
------------------------------------------------
-Above we saw that, the more effort you put to avoid instability, the more option
-you deny. And even most restrictive work flow can't guarantee that instability
+Above we saw that the more effort you put to avoid instability, the more options
+you deny. And even the most restrictive workflow can't guarantee that instability
will never show up!
Obsolete marker can handle the job
```````````````````````````````````
-It is time to provide a full featured solution to deal with
+It is time to provide a full-featured solution to deal with
instability and to stop working around the issue! This is why I
-developing a new feature for mercurial called "Obsolete markers".
+am developing a new feature for Mercurial called "Obsolete markers".
Obsolete markers have two key properties:
-* Any "old" changeset we want to get ride of is **explicitly** marked
- as "obsolete" by history rewriting operation.
+* Any "old" changeset we want to get rid of is **explicitly** marked
+ as "obsolete" by history rewriting operations.
By explicitly marking the obsolete part of the history, we will be able to
easily detect instability situation.
@@ -165,31 +166,31 @@
* Relations between old and new version of changesets are tracked by obsolete
markers.
- By Storing a meta-history of changeset evolution we are able to easily resolve
- instability and edition conflict [#]_ .
+ By storing a meta-history of changeset evolution we are able to easily resolve
+ instability and edit conflicts [#]_ .
-.. [#] edition conflict is another major obstable to collaboration. See the
+.. [#] Edit conflicts is another major obstable to collaboration. See the
section dedicated to obsolete marker for details.
-Improves robustness == improves simplicity
+Improved robustness == improved simplicity
````````````````````````````````````````````````
This proposal should **first** be seen as a safety measure.
-It allow to detect instability as soon as possible
+It allows detecting instability as soon as possible.
::
$ hg pull
added 3 changeset
+2 unstable changeset
- (do you want "hg stabilize" ?)
+ (do you want "hg evolve" ?)
working directory parent is obsolete!
$ hg push
outgoing unstable changesets
- (use "hg stabilize" or force the push)
+ (use "hg evolve" or force the push)
-And should not not encourage people to create instability
+And it should not not encourage people to create instability.
::
--- a/docs/makefile Thu Aug 23 18:09:45 2012 +0200
+++ b/docs/makefile Thu Jun 26 15:27:25 2014 +0100
@@ -1,6 +1,11 @@
-all: tutorial
+all: tutorials/tutorial.rst static/logo-evolve.ico
sphinx-build . ../html/
-tutorial:
+tutorials/tutorial.rst: tutorials/tutorial.t
python test2rst.py tutorials/
+
+static/logo-evolve.ico: static/logo-evolve.svg
+ convert -resize 36x36 static/logo-evolve.svg static/logo-evolve.ico
+
+
--- a/docs/obs-concept.rst Thu Aug 23 18:09:45 2012 +0200
+++ b/docs/obs-concept.rst Thu Jun 26 15:27:25 2014 +0100
@@ -1,3 +1,6 @@
+.. Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org>
+.. Logilab SA <contact@logilab.fr>
+
-----------------------------------------------------------
Why Do We Need a New Concept
-----------------------------------------------------------
@@ -54,15 +57,8 @@
*meaningful*.
-.. warning:: add a schema::
+.. figure:: ./figures/git.*
- C
- | B---<foo>
- |/
- |
- A
-
- Only B and A are visible.
This simplifies the process of getting rid of old changesets. You can
just leave them in place and move the reference on the new one. You
@@ -297,8 +293,7 @@
will keep the same parent than `A'` and `A''` with two obsolete
markers pointing to both `A` and `A'`
-.. warning:: TODO: Add a schema of the resolution. (merge A' and A'' with A as
- ancestor and graft the result of A^)
+.. figure:: ./figures/explain-troubles-concurrent-10-solution.*
Allowing multiple new changesets to obsolete a single one allows to
distinguish a split changeset from a history rewriting conflict.
@@ -319,15 +314,17 @@
* Public changesets are excluded from the obsolete set (public
changesets are never hidden or candidate to garbage collection)
-* *newer* version of a public changeset are called **latecomer** and
+* *newer* version of a public changeset are called **bumped** and
highlighted as an error case.
+.. figure:: ./figures/explain-troubles-concurrent-10-sumup.*
+
Solving such an error is easy. Because we know what changeset a
-*latecomer* tries to rewrite, we can easily compute a smaller
+*bumped* tries to rewrite, we can easily compute a smaller
changeset containing only the change from the old *public* to the new
-*latecomer*.
+*bumped*.
-.. warning:: add a schema
+.. figure:: ./figures/explain-troubles-concurrent-15-solution.*
Conclusion
--- a/docs/obs-implementation.rst Thu Aug 23 18:09:45 2012 +0200
+++ b/docs/obs-implementation.rst Thu Jun 26 15:27:25 2014 +0100
@@ -1,3 +1,5 @@
+.. Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org>
+.. Logilab SA <contact@logilab.fr>
-----------------------------------------------------
Implementation of Obsolete Marker
@@ -8,100 +10,6 @@
-----------------------------------------------------
-What data should be contained in a Marker ?
-````````````````````````````````````````````````````
-
-There are two critical pieces of information that **must** be stored
-in an obsolete Marker.
-
-:object:
- the old obsoleted changeset
-
-:replacements:
- list of new changeset. list size can be anything, including 0 (0..N)
-
-Everybody agreed on this point.
-
- ---
-
-This is probably a good idea to have an unique Identifier, for UI, transfer and
-access.
-
- :id: same as changeset but for marker.
-
-The field below will depend on the way we exchange obsolete marker between
-changesets.
-
- ---
-
-Having audit data will be very useful. When it gets messy you need all the
-information available to understand the situation.
-
-I have the feeling that we are versioning history. Therefor we will probably
-need the same kind of information than when versioning Files.
-
-:date: date of the marker creation
-
-:user: ui.username
-
-To go further:
-
-:description: "Optional reason for the rewrite (generated by the user)"
-
-:tool: the automated tool that made this
-
-:operation: Kind of rewritting operation that created the marker (delete,
- update, split, fold, reordering), to help conflict resolution.
-
-Matt said this is "too complicated". I'll wait for him to meet a very hairy
-situation to agree that they are needed.
-
-Leaving the door open to any addition data is an option too.
-
-How shall we store Marker on disk
-`````````````````````````````````````````````````````````
-
-Requirement
-.............
-
-We need to quickly load the 'object' to know the "obsolete" set.
-We need quick access by object and replacements to travels along the graph.
-
-Common Part
-.............
-
-The file is store in `.hg/store/obsmarkers`. It is a binary files:
-
-The files starts with a Format Version string
-
-
-Minimalistic proposal
-.........................
-
-The core of a Marker will we stored as:
-
-* number of replacement (8-Bytes integer)
-* node id of the obsolete changeset (20-Bytes hash)
-* node id of replacement changeset (20-Bytes hash x number of remplacement)
-
-Version with ID
-.........................
-
-This version add a node id computed from the marker content. It will be present
-*before* other data:
-
-* node id of the maker (20-Bytes hash)
-
-
-Version with Metadata proposal
-...............................
-
-An extra files is used to old metadata (date, user, etc) `.hg/store/obs-extra`:.
-
-The format of this field is undefined yet. This will add the following
-field at the end of a marker
-
-* offset of the metadata in obs-extra (8-Bytes integer)
How shall we exchange Marker over the Wire ?
@@ -188,26 +96,11 @@
Current status
-----------------------------------------------------
-An experimental implementatione exists. What have been done so far.
-
-
-* 1-1 obsolete marker stored outside history,
+Obsolete marker are partialy in core.
-* compute obsolete-tip
-
-* obsolete marker exchange through pushkey,
-
-* compute obsolete, unstable, extinct and suspended set.
+2.3:
-* hidden extinct changesets for UI.
-
-* Use secret phase to remove from discovery obsolete and unstable changesets (to
- be improved soon)
-
-* alter rebase to use obsolete markers instead of stripping.
-
-* Have an experimental mq-like extension to rewrite history (more on that later)
-
-* Have an extension to update and mq repository according evolution of
- standard (more on that later)
-
+- storage over obsolete marker
+- exchange suing pushkey
+- extinct changeset are properly hidden
+- extinct changeset are excluded from exchange
--- a/docs/obs-terms.rst Thu Aug 23 18:09:45 2012 +0200
+++ b/docs/obs-terms.rst Thu Jun 26 15:27:25 2014 +0100
@@ -1,3 +1,6 @@
+.. Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org>
+.. Logilab SA <contact@logilab.fr>
+
-----------------------------------------------------------
Terminology of the obsolete concept
-----------------------------------------------------------
@@ -48,7 +51,7 @@
**newest successors**..
.. note:: I'm not very happy with this naming scheme and I'm looking for a
- better distinction between *direct successors* and **any successors*.
+ better distinction between *direct successors* and **any successors**.
Possible changesets "type"
---------------------------------
@@ -89,30 +92,30 @@
| | | |
| +--------------------------+-----------------------------+
| | | |
-| | **troublesome** | **unstable** |
+| | **troubled** | **unstable** |
| | | |
-| | *troublesome* has | *unstable* is a changeset |
+| | *troubled* has | *unstable* is a changeset |
| | unresolved issue caused | with obsolete ancestors. |
| | by *obsolete* relations. | |
| | | |
| | Possible issues are | It must be rebased on a |
-| | listed in the next | non *troublesome* base to |
+| | listed in the next | non *troubled* base to |
| | column. It is possible | solve the problem. |
-| | for *troublesome* | |
+| | for *troubled* | |
| | changeset to combine | (possible alternative name: |
| | multiple issue at once. | precarious) |
-| | (a.k.a. conflicting and | |
+| | (a.k.a. divergent and | |
| | unstable) +-----------------------------+
| | | |
-| | (possible alternative | **latecomer** |
+| | (possible alternative | **bumped** |
| | names: unsettled, | |
-| | troubled) | *latecomer* is a changeset |
+| | troublesome | *bumped* is a changeset |
| | | that tries to be successor |
| | | of public changesets. |
| | | |
| | | Public changeset can't |
| | | be deleted and replace |
-| | | *latecomer* |
+| | | *bumped* |
| | | need to be converted into |
| | | an overlay to this public |
| | | changeset. |
@@ -122,17 +125,17 @@
| | | mindless, disenchanting) |
| | | |
| | +-----------------------------+
-| | | **conflicting** |
+| | | **divergent** |
| | | |
-| | | *conflicting* is changeset |
+| | | *divergent* is changeset |
| | | that appears when multiple |
| | | changesets are successors |
| | | of the same precursor. |
| | | |
-| | | *conflicting* are solved |
+| | | *divergent* are solved |
| | | through a three ways merge |
| | | between the two |
-| | | *conflictings*, |
+| | | *divergent* , |
| | | using the last "obsolete- |
| | | -common-ancestor" as the |
| | | base. |
@@ -141,10 +144,14 @@
| | | properly not detected as a |
| | | conflict) |
| | | |
+| | | (possible alternative names:|
+| | | clashing, rival, concurent, |
+| | | conflicting) |
+| | | |
| +--------------------------+-----------------------------+
| | |
| | Mutable changesets which are neither *obsolete* or |
-| | *troublesome* are *"ok"*. |
+| | *troubled* are *"ok"*. |
| | |
| | Do we really need a name for it ? *"ok"* is a pretty |
| | crappy name :-/ other possibilities are: |
@@ -172,13 +179,6 @@
| |
+------------------------------------------------------------------------------+
-.. note:: I'm not very happy with the naming of:
-
- - "ok" changeset
- - latecomer
- - troublesome
-
- Any better idea are welcome.
Command and operation name
@@ -222,18 +222,16 @@
- kill: shall has funny effects when you forget "hg" in front of ``hg kill``.
- obsolete: too vague, too long and too generic.
-Stabilize
+evolve
```````````````
Automatically resolve *troublesome* changesets
-(*unstable*, *latecomer* and *conflicting*)
+(*unstable*, *bumped* and *divergent*)
This is an important name as hg pull/push will suggest it the same way it
suggest merging when you add heads.
-I do not like stabilize much.
-
alternative names:
- solve (too generic ?)
-- evolve (too vague)
+- stabilize
--- a/docs/qsync.rst Thu Aug 23 18:09:45 2012 +0200
+++ b/docs/qsync.rst Thu Jun 26 15:27:25 2014 +0100
@@ -1,12 +1,15 @@
+.. Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org>
+.. Logilab SA <contact@logilab.fr>
+
---------------------------------------------------------------------
Qsync: Mercurial to MQ exporter
---------------------------------------------------------------------
-People may have tools or co-workers that export to receive mutable history using
-a versioned mq repository.
+People may have tools or co-workers that expect to receive mutable history using
+a versioned MQ repository.
-For this purpose you can use the ``qsync`` extension:
+For this purpose you can use the ``qsync`` extension.
To enable the evolve extension use::
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/static/logo-evolve.svg Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,622 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.0"
+ width="100"
+ height="100"
+ viewBox="0 0 124.766 126.74917"
+ id="Layer_1"
+ xml:space="preserve"
+ sodipodi:version="0.32"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="logo-evolve.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ style="display:inline"><metadata
+ id="metadata6845"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title><dc:creator><cc:Agent><dc:title>Cali Mastny and Matt Mackall</dc:title></cc:Agent></dc:creator><cc:license
+ rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /><dc:date>Feb 12 2008</dc:date></cc:Work><cc:License
+ rdf:about="http://creativecommons.org/licenses/GPL/2.0/"><cc:permits
+ rdf:resource="http://web.resource.org/cc/Reproduction" /><cc:permits
+ rdf:resource="http://web.resource.org/cc/Distribution" /><cc:requires
+ rdf:resource="http://web.resource.org/cc/Notice" /><cc:permits
+ rdf:resource="http://web.resource.org/cc/DerivativeWorks" /><cc:requires
+ rdf:resource="http://web.resource.org/cc/ShareAlike" /><cc:requires
+ rdf:resource="http://web.resource.org/cc/SourceCode" /></cc:License></rdf:RDF></metadata><sodipodi:namedview
+ inkscape:window-height="1165"
+ inkscape:window-width="1918"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ inkscape:zoom="5.4093668"
+ inkscape:cx="86.89449"
+ inkscape:cy="46.517129"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:current-layer="Layer_1"
+ width="100px"
+ height="120px"
+ units="px"
+ showgrid="false"
+ inkscape:window-maximized="0"><sodipodi:guide
+ position="0,0"
+ orientation="0,100"
+ id="guide3006" /><sodipodi:guide
+ position="100,0"
+ orientation="-120,0"
+ id="guide3008" /><sodipodi:guide
+ position="-14.419433,100.19657"
+ orientation="0,-100"
+ id="guide3010" /><sodipodi:guide
+ position="0,142.90028"
+ orientation="120,0"
+ id="guide3012" /></sodipodi:namedview><defs
+ id="defs261"><inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 60 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="100 : 60 : 1"
+ inkscape:persp3d-origin="50 : 40 : 1"
+ id="perspective146" /></defs>
+<pattern
+ overflow="visible"
+ viewBox="2.125 -70.896 69 69"
+ id="Polka_Dot_Pattern"
+ patternUnits="userSpaceOnUse"
+ height="69"
+ width="69"
+ y="736.415"
+ x="-316">
+ <g
+ id="g4">
+ <polygon
+ id="polygon6"
+ points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896 "
+ fill="none" />
+ <polygon
+ id="polygon8"
+ points="71.125,-1.896 2.125,-1.896 2.125,-70.896 71.125,-70.896 "
+ fill="#F7BC60" />
+ <g
+ id="g10">
+ <path
+ id="path12"
+ d="M61.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path14"
+ d="M54.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path16"
+ d="M46.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path18"
+ d="M38.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path20"
+ d="M31.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path22"
+ d="M23.439-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path24"
+ d="M15.772-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path26"
+ d="M8.105-71.653c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path28"
+ d="M0.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19C0.361-71.362,0.3-71.4,0.248-71.335 c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ </g>
+ <g
+ id="g30">
+ <path
+ id="path32"
+ d="M69.439-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.062-0.165,0.128 c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ </g>
+ <path
+ id="path34"
+ d="M0.495-71.653c0.018,0.072,0.008,0.127-0.026,0.19c-0.052,0.101-0.113,0.062-0.165,0.128 c-0.051,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224C0.5-71.68,0.503-71.744,0.51-71.626 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <g
+ id="g36">
+ <g
+ id="g38">
+ <path
+ id="path40"
+ d="M69.439-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path42"
+ d="M61.778-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path44"
+ d="M54.118-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path46"
+ d="M46.458-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path48"
+ d="M38.797-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path50"
+ d="M31.137-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path52"
+ d="M23.477-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path54"
+ d="M15.816-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path56"
+ d="M8.156-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path58"
+ d="M0.495-64.001c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143C2-61.45,2.217-61.397,2.391-61.46c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ </g>
+ <g
+ id="g60">
+ <path
+ id="path62"
+ d="M69.439-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path64"
+ d="M61.778-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path66"
+ d="M54.118-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path68"
+ d="M46.458-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path70"
+ d="M38.797-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path72"
+ d="M31.137-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path74"
+ d="M23.477-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path76"
+ d="M15.816-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path78"
+ d="M8.156-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path80"
+ d="M0.495-56.348c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-56.374,0.503-56.438,0.51-56.32 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ </g>
+ <g
+ id="g82">
+ <path
+ id="path84"
+ d="M69.439-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path86"
+ d="M61.778-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path88"
+ d="M54.118-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path90"
+ d="M46.458-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path92"
+ d="M38.797-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path94"
+ d="M31.137-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path96"
+ d="M23.477-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path98"
+ d="M15.816-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path100"
+ d="M8.156-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path102"
+ d="M0.495-48.695c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ </g>
+ <g
+ id="g104">
+ <path
+ id="path106"
+ d="M69.439-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path108"
+ d="M61.778-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path110"
+ d="M54.118-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path112"
+ d="M46.458-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path114"
+ d="M38.797-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path116"
+ d="M31.137-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path118"
+ d="M23.477-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path120"
+ d="M15.816-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path122"
+ d="M8.156-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 C8.15-41.004,8.149-41.02,8.14-41.04"
+ fill="#FFFFFF" />
+ <path
+ id="path124"
+ d="M0.495-41.042c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ </g>
+ <g
+ id="g126">
+ <path
+ id="path128"
+ d="M69.439-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path130"
+ d="M61.778-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path132"
+ d="M54.118-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path134"
+ d="M46.458-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path136"
+ d="M38.797-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path138"
+ d="M31.137-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path140"
+ d="M23.477-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path142"
+ d="M15.816-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path144"
+ d="M8.156-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path146"
+ d="M0.495-33.39c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-33.416,0.503-33.48,0.51-33.362 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ </g>
+ <g
+ id="g148">
+ <path
+ id="path150"
+ d="M69.439-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path152"
+ d="M61.778-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path154"
+ d="M54.118-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path156"
+ d="M46.458-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path158"
+ d="M38.797-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path160"
+ d="M31.137-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path162"
+ d="M23.477-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path164"
+ d="M15.816-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path166"
+ d="M8.156-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path168"
+ d="M0.495-25.736c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ </g>
+ <g
+ id="g170">
+ <path
+ id="path172"
+ d="M69.439-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path174"
+ d="M61.778-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path176"
+ d="M54.118-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path178"
+ d="M46.458-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path180"
+ d="M38.797-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path182"
+ d="M31.137-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path184"
+ d="M23.477-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path186"
+ d="M15.816-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path188"
+ d="M8.156-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path190"
+ d="M0.495-18.084c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224C0.5-18.11,0.503-18.175,0.51-18.057 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ </g>
+ <g
+ id="g192">
+ <path
+ id="path194"
+ d="M69.439-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362C69-9.692,69.159-9.523,69.154-9.4c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path196"
+ d="M61.778-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path198"
+ d="M54.118-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path200"
+ d="M46.458-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path202"
+ d="M38.797-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path204"
+ d="M31.137-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path206"
+ d="M23.477-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path208"
+ d="M15.816-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.009,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 c0.177,0.042,0.384-0.104,0.543-0.143c0.18-0.043,0.397,0.01,0.571-0.053C17.933-7.969,17.839-8.227,18-8.34 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path210"
+ d="M8.156-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 C7.915-10.05,7.866-9.836,7.886-9.75C7.717-9.692,7.876-9.523,7.871-9.4C7.868-9.351,7.83-9.295,7.826-9.239 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C9.114-7.652,9.321-7.799,9.48-7.837c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path212"
+ d="M0.495-10.431c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 C0.254-10.05,0.205-9.836,0.225-9.75C0.056-9.692,0.215-9.523,0.21-9.4c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37C0.33-8.671,0.501-8.456,0.668-8.325c0.19,0.148,0.365,0.572,0.608,0.631 C1.454-7.652,1.66-7.799,1.819-7.837C2-7.88,2.217-7.827,2.391-7.89c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46C3.477-8.933,3.471-8.995,3.5-9.071 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ </g>
+ </g>
+ <g
+ id="g214">
+ <path
+ id="path216"
+ d="M69.439-2.778c0.018,0.072,0.008,0.127-0.026,0.19C69.361-2.487,69.3-2.525,69.248-2.46 c-0.051,0.062-0.099,0.276-0.079,0.362C69-2.04,69.159-1.871,69.154-1.748c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C70.397,0,70.604-0.146,70.763-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.215,0.124-0.215,0.224c0.002,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path218"
+ d="M61.778-2.778c0.018,0.072,0.007,0.127-0.026,0.19C61.7-2.487,61.64-2.525,61.587-2.46 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C62.737,0,62.943-0.146,63.103-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224C61.915-3.117,61.78-3.02,61.781-2.92c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path220"
+ d="M54.118-2.778c0.018,0.072,0.007,0.127-0.026,0.19C54.04-2.487,53.98-2.525,53.927-2.46 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C55.077,0,55.283-0.146,55.442-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224C54.255-3.117,54.12-3.02,54.121-2.92c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path222"
+ d="M46.458-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C47.416,0,47.623-0.146,47.782-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224C46.594-3.117,46.459-3.02,46.46-2.92c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path224"
+ d="M38.797-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C39.756,0,39.962-0.146,40.122-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224C38.934-3.117,38.799-3.02,38.8-2.92c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path226"
+ d="M31.137-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C32.095,0,32.302-0.146,32.461-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224C31.273-3.117,31.139-3.02,31.14-2.92c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path228"
+ d="M23.477-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C24.435,0,24.642-0.146,24.801-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 c-0.021,0.011-0.021-0.005-0.03-0.025"
+ fill="#FFFFFF" />
+ <path
+ id="path230"
+ d="M15.816-2.778c0.018,0.072,0.007,0.127-0.026,0.19c-0.053,0.101-0.112,0.062-0.165,0.128 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C16.774,0,16.981-0.146,17.14-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789c-0.18,0.034-0.287,0.126-0.442,0.207 c-0.17,0.088-0.139,0.166-0.318,0.224c-0.081,0.026-0.216,0.124-0.215,0.224c0.001,0.115,0.005,0.051,0.012,0.169 C15.81-2.74,15.809-2.756,15.8-2.776"
+ fill="#FFFFFF" />
+ <path
+ id="path232"
+ d="M8.156-2.778c0.018,0.072,0.007,0.127-0.026,0.19C8.077-2.487,8.018-2.525,7.965-2.46 c-0.05,0.062-0.099,0.276-0.079,0.362c-0.169,0.058-0.01,0.227-0.015,0.35C7.868-1.698,7.83-1.643,7.826-1.587 c-0.01,0.119,0.017,0.266,0.068,0.37c0.097,0.198,0.268,0.413,0.435,0.544c0.19,0.148,0.365,0.572,0.608,0.631 C9.114,0,9.321-0.146,9.48-0.185c0.18-0.043,0.397,0.01,0.571-0.053c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.069,0.339-0.263,0.376-0.46c0.016-0.082,0.01-0.145,0.039-0.221 c0.039-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.052-0.12-0.064-0.187c-0.022-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789C8.954-3.54,8.847-3.448,8.692-3.367 c-0.17,0.088-0.139,0.166-0.318,0.224C8.292-3.117,8.158-3.02,8.159-2.92C8.16-2.805,8.164-2.869,8.17-2.751 C8.15-2.74,8.149-2.756,8.14-2.776"
+ fill="#FFFFFF" />
+ <path
+ id="path234"
+ d="M0.495-2.778c0.018,0.072,0.008,0.127-0.026,0.19C0.417-2.487,0.356-2.525,0.304-2.46 C0.253-2.397,0.205-2.184,0.225-2.098C0.056-2.04,0.215-1.871,0.21-1.748c-0.002,0.05-0.041,0.105-0.045,0.161 c-0.01,0.119,0.017,0.266,0.068,0.37C0.33-1.019,0.501-0.804,0.668-0.673c0.19,0.148,0.365,0.572,0.608,0.631 C1.454,0,1.66-0.146,1.819-0.185C2-0.228,2.217-0.175,2.391-0.237c0.222-0.079,0.127-0.337,0.288-0.45 c0.104-0.074,0.287-0.01,0.406-0.051c0.2-0.07,0.339-0.263,0.376-0.46C3.477-1.28,3.471-1.343,3.5-1.419 c0.038-0.103,0.111-0.16,0.09-0.293c-0.01-0.062-0.051-0.12-0.064-0.187c-0.021-0.114,0.002-0.224,0-0.337 c-0.003-0.2,0.017-0.379-0.078-0.55c-0.38-0.688-1.236-0.929-1.975-0.789C1.293-3.54,1.187-3.448,1.031-3.367 c-0.17,0.088-0.139,0.166-0.318,0.224C0.632-3.117,0.498-3.02,0.498-2.92C0.5-2.805,0.503-2.869,0.51-2.751 C0.489-2.74,0.488-2.756,0.479-2.776"
+ fill="#FFFFFF" />
+ </g>
+ </g>
+</pattern>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<rect
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.83134139;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ id="rect6847"
+ width="126.74917"
+ height="126.99831"
+ x="-0.99158502"
+ y="-0.24915084" /><g
+ id="g2996"
+ transform="matrix(0.46679402,-0.88436607,0.88436607,0.46679402,-20.509268,97.149298)"><path
+ d="M 107.61309,85.427163 C 126.35316,54.267748 103.65523,3.7316784 62.152514,8.8657974 24.653999,13.501508 24.049791,52.97069 57.097677,62.347028 c 28.598853,8.121324 5.908299,26.261404 6.571301,38.341302 0.665797,12.07808 24.862369,16.46007 43.944112,-15.261167 z"
+ style="fill:#1b1a1b"
+ id="path2339" /><path
+ d="M 108.32072,84.162974 C 127.06181,53.003291 104.36388,2.4672218 62.861165,7.6013402 25.362652,12.23705 24.757687,51.707522 57.805574,61.083859 c 28.598853,8.121324 5.908299,26.261404 6.571569,38.342322 0.666551,12.076789 24.861834,16.458029 43.943577,-15.263207 z"
+ style="fill:#bfbfbf"
+ id="path2561" /><path
+ d="m 69.186033,104.19365 c -1.135692,-1.84204 0.601038,-3.88837 2.386188,-3.73277 2.841598,0.24886 9.028642,-0.0333 13.910588,-2.800482 C 97.6794,90.746293 116.44888,57.478025 107.00882,36.495137 102.78257,27.102283 100.72467,24.412915 96.372318,19.81831 c -0.887874,-0.937057 -0.378162,-0.886124 0.223066,-0.568957 2.353599,1.235189 6.489446,6.019569 10.731716,13.806724 7.16765,13.156791 6.79595,28.797842 4.13015,38.609442 -1.85691,6.825577 -8.25281,22.266533 -17.619587,28.942751 -9.387853,6.69156 -20.372606,10.52943 -24.65163,3.58538 z"
+ style="fill:#000000"
+ id="path2563" /><path
+ d="M 60.687485,61.019981 C 54.297665,59.123186 46.06011,56.4817 41.295423,50.249529 c -3.51248,-4.595193 -5.295582,-9.610385 -5.750944,-12.454176 -0.162003,-1.014713 -0.299617,-1.861261 -0.0075,-2.094878 0.135238,-0.108497 2.622869,5.514283 6.341685,10.226737 3.718069,4.713742 8.914807,7.470526 13.24405,8.472162 3.850608,0.890203 11.826899,2.846243 14.525556,5.145317 2.77437,2.363257 3.005946,7.469336 2.072352,8.045384 C 70.779125,68.169283 68.87,63.447817 60.687289,61.019981 z"
+ style="fill:#000000"
+ id="path2565" /><path
+ d="m 73.863069,105.09442 c -0.123332,1.46251 1.556525,1.74932 3.817708,1.41046 2.898288,-0.43471 5.349293,-0.76107 8.685191,-2.43293 4.521182,-2.2658 9.09685,-5.506989 12.447924,-9.879632 9.998228,-13.044622 13.538728,-28.478823 12.993498,-30.69907 -0.1822,1.833569 -2.59588,11.458073 -8.11589,20.134991 -7.089521,11.145311 -12.230531,17.081841 -24.087282,19.959951 -3.299704,0.80164 -5.579675,-0.41901 -5.741149,1.50623 z"
+ style="fill:#ffffff"
+ id="path2567" /><path
+ d="m 47.56572,54.369317 c 1.350435,1.145429 4.117343,2.671707 9.561614,4.457113 6.575462,2.155844 9.776981,4.025449 11.117744,4.921402 1.420732,0.951385 2.321212,3.074269 2.41017,1.188742 0.09277,-1.887616 -1.070702,-3.510729 -3.66667,-4.37155 -1.756347,-0.583153 -4.7109,-1.97194 -7.543128,-2.530905 -1.819913,-0.359233 -4.780811,-1.072155 -7.320051,-1.849642 -1.391646,-0.427711 -2.809634,-1.1769 -4.559679,-1.81516 z"
+ style="fill:#ffffff"
+ id="path2569" /><path
+ d="M 105.72614,63.921199 C 113.7054,40.922252 97.007933,6.1896881 63.228641,10.367773 32.706856,14.141463 32.214677,46.266552 59.113519,53.899069 89.582156,58.51118 71.235202,81.495802 68.632602,93.086552 66.299323,103.47658 93.255777,105.18656 105.72614,63.921199 z"
+ style="fill:#999999"
+ id="path2561_1_" /><path
+ d="m 84.848561,81.885586 c -8.254188,-1.021445 -20.13245,17.614405 -8.932534,15.431899 11.198141,-2.180945 -11.199916,2.182506 0,0 5.383182,-0.798314 9.842872,-2.698914 13.835192,-7.255788 5.205477,-5.940314 12.981581,-18.771954 15.230561,-27.062759 1.89451,-6.990334 0.94225,-17.820653 -1.01071,-7.64474 -2.00298,10.4432 -10.868321,27.552835 -19.122509,26.531388 z"
+ style="fill:#f3f3f3"
+ id="path2571" /></g>
+<text
+ xml:space="preserve"
+ style="font-size:35.48976898px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Balker;-inkscape-font-specification:Balker"
+ x="16.816299"
+ y="109.87854"
+ id="text3014"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan3018"
+ x="16.816299"
+ y="109.87854">evolve</tspan></text>
+<g
+ id="g2988"
+ transform="matrix(0.74328759,-0.66897202,0.66897202,0.74328759,8.9028358,75.473986)"><path
+ d="M 19.418398,44.509742 C 13.566506,45.076202 9.2828039,50.274467 9.8492604,56.126357 10.416792,61.982332 15.614839,66.269362 21.46775,65.702634 27.31879,65.12876 31.606084,59.931735 31.037317,54.079359 30.468598,48.231333 25.271308,43.943014 19.418398,44.509742 z"
+ style="fill:#1b1a1b"
+ id="path2343" /><path
+ d="M 20.127041,43.245285 C 14.275159,43.811746 9.9914567,49.01001 10.557913,54.8619 c 0.567261,5.854953 5.765579,10.143005 11.61747,9.576545 5.85206,-0.574142 10.139092,-5.772187 9.569297,-11.624297 -0.567701,-5.848293 -5.764728,-10.13559 -11.617639,-9.568863 z"
+ style="fill:#bfbfbf"
+ id="path2589" /><path
+ d="m 15.297614,61.936273 c 0.0649,0.752128 1.095012,1.718382 2.713381,2.162016 1.390355,0.381136 4.974531,1.355379 9.578993,-1.550784 4.604462,-2.906163 5.135393,-10.679565 3.042277,-12.965884 -0.647907,-1.158064 -1.490462,-2.001165 -0.820074,-0.152965 1.692982,4.666774 -1.596739,9.032083 -4.434212,11.053479 -2.836454,2.021128 -6.433853,1.064641 -7.902778,0.616794 -1.468915,-0.447847 -2.243523,0.0604 -2.177587,0.837344 z"
+ style="fill:#000000"
+ id="path2591" /><path
+ d="m 21.239503,62.980483 c 0.422006,-0.379939 2.558364,-0.22464 4.487234,-1.261971 1.92785,-1.037065 4.219346,-3.310451 4.628251,-6.540865 0.240881,-1.896934 0.313223,-1.420583 0.409121,-0.387475 -0.299215,5.370492 -5.238089,8.336927 -8.06262,8.72834 -0.76217,0.105705 -2.103468,0.04118 -1.461986,-0.538029 z"
+ style="fill:#ffffff"
+ id="path2597" /><path
+ d="m 12.336171,56.430605 c 0.380898,1.199486 1.354175,2.949646 3.409446,3.241412 2.744512,0.389611 3.30561,1.629622 6.546396,0.986326 3.240786,-0.643297 5.697258,-3.299154 6.680242,-6.23693 1.125385,-4.064906 -0.559668,-6.163496 -3.095682,-8.037135 -2.536005,-1.873639 -8.114707,-1.672161 -11.443975,1.362735 -2.366007,2.155435 -3.02378,5.763265 -2.096427,8.683592 z"
+ style="fill:#999999"
+ id="path2593_2_" /><path
+ d="m 23.114098,59.11873 c 2.490146,-0.651887 5.783458,-4.045016 4.14851,-6.635646 -2.017128,-3.192057 -7.636948,-0.459737 -7.826995,3.094121 -0.190795,3.555146 1.039269,4.232436 3.678485,3.541525 z"
+ style="fill:#f3f3f3"
+ id="path256" /></g></svg>
\ No newline at end of file
--- a/docs/test2rst.py Thu Aug 23 18:09:45 2012 +0200
+++ b/docs/test2rst.py Thu Jun 26 15:27:25 2014 +0100
@@ -27,7 +27,7 @@
if os.path.isdir(base):
one_dir(base)
else:
- print one_file(base)
+ one_file(base)
def one_dir(base):
@@ -37,14 +37,12 @@
for fn in sorted(os.listdir(base)):
if not fn.endswith('.t'):
continue
- print fn
name = os.path.splitext(fn)[0]
content = one_file(op.join(base, fn))
target = op.join(base, name + '.rst')
#with file(doc(name + '.rst'), 'w') as f:
with file(target, 'w') as f:
f.write(content)
- print f
index += '\n ' + name
--- a/docs/tutorials/tutorial.t Thu Aug 23 18:09:45 2012 +0200
+++ b/docs/tutorials/tutorial.t Thu Jun 26 15:27:25 2014 +0100
@@ -1,775 +1,1 @@
-
-Initial setup
--------------
-
-This Mercurial configuration example is used for testing.
-.. Various setup
-
- $ cat >> $HGRCPATH << EOF
- > [ui]
- > logtemplate ="{node|short} ({phase}): {desc}\n"
- > [diff]
- > git = 1
- > [alias]
- > # "-d '0 0'" means that the new commit will be at January 1st 1970.
- > # This is used for stable hash during test
- > amend = amend -d '0 0'
- > [extensions]
- > hgext.graphlog=
- > EOF
-
- $ hg init local
- $ cat >> local/.hg/hgrc << EOF
- > [paths]
- > remote = ../remote
- > other = ../other
- > [ui]
- > user = Babar the King
- > EOF
-
- $ hg init remote
- $ cat >> remote/.hg/hgrc << EOF
- > [paths]
- > local = ../local
- > [ui]
- > user = Celestine the Queen
- > EOF
-
- $ hg init other
- $ cat >> other/.hg/hgrc << EOF
- > [ui]
- > user = Princess Flore
- > EOF
-
-
-This tutorial use the following configuration for Mercurial:
-
-A compact log template with phase data:
-
- $ hg showconfig ui
- ui.slash=True
- ui.logtemplate="{node|short} ({phase}): {desc}\n"
-
-Improved git format diff:
-
- $ hg showconfig diff
- diff.git=1
-
-And the graphlog extension
- $ hg showconfig extensions
- extensions.hgext.graphlog=
-
-And of course, we anabled the experimental extensions for mutable history:
-
- $ $(dirname $TESTDIR)/enable.sh >> $HGRCPATH 2> /dev/null
-
-
------------------------
-Single Developer Usage
------------------------
-
-This tutorial shows how to use evolution to rewrite history locally.
-
-
-Fixing mistake with `hg amend`
---------------------------------
-
-We are versionning a shopping list
-
- $ cd local
- $ cat >> shopping << EOF
- > Spam
- > Whizzo butter
- > Albatross
- > Rat (rather a lot)
- > Jugged fish
- > Blancmange
- > Salmon mousse
- > EOF
- $ hg commit -A -m "Monthy Python Shopping list"
- adding shopping
-
-Its first version is shared with the outside.
-
- $ hg push remote
- pushing to $TESTTMP/remote
- searching for changes
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 1 changes to 1 files
-
-Later I add additional item to my list
-
- $ cat >> shopping << EOF
- > Egg
- > Suggar
- > Vinegar
- > Oil
- > EOF
- $ hg commit -m "adding condiment"
- $ cat >> shopping << EOF
- > Bananos
- > Pear
- > Apple
- > EOF
- $ hg commit -m "adding fruit"
-
-This history is very linear
-
- $ hg glog
- @ d85de4546133 (draft): adding fruit
- |
- o 4d5dc8187023 (draft): adding condiment
- |
- o 7e82d3f3c2cb (public): Monthy Python Shopping list
-
-
-But a typo was made in Babanas!
-
- $ hg export tip
- # HG changeset patch
- # User test
- # Date 0 0
- # Node ID d85de4546133030c82d257bbcdd9b1b416d0c31c
- # Parent 4d5dc81870237d492284826e21840b2ca00e26d1
- adding fruit
-
- diff --git a/shopping b/shopping
- --- a/shopping
- +++ b/shopping
- @@ -9,3 +9,6 @@
- Suggar
- Vinegar
- Oil
- +Bananos
- +Pear
- +Apple
-
-The faulty changeset is in the "draft" phase because he was not exchanged with
-the outside. The first one have been exchanged and is an immutable public
-changeset.
-
- $ hg glog
- @ d85de4546133 (draft): adding fruit
- |
- o 4d5dc8187023 (draft): adding condiment
- |
- o 7e82d3f3c2cb (public): Monthy Python Shopping list
-
-
-hopefully. I can use hg amend to rewrite my faulty changeset!
-
- $ sed -i'' -e s/Bananos/Banana/ shopping
- $ hg diff
- diff --git a/shopping b/shopping
- --- a/shopping
- +++ b/shopping
- @@ -9,6 +9,6 @@
- Suggar
- Vinegar
- Oil
- -Bananos
- +Banana
- Pear
- Apple
- $ hg amend
-
-A new changeset with the right diff replace the wrong one.
-
- $ hg glog
- @ 0cacb48f4482 (draft): adding fruit
- |
- o 4d5dc8187023 (draft): adding condiment
- |
- o 7e82d3f3c2cb (public): Monthy Python Shopping list
-
- $ hg export tip
- # HG changeset patch
- # User test
- # Date 0 0
- # Node ID 0cacb48f44828d2fd31c4e45e18fde32a5b2f07b
- # Parent 4d5dc81870237d492284826e21840b2ca00e26d1
- adding fruit
-
- diff --git a/shopping b/shopping
- --- a/shopping
- +++ b/shopping
- @@ -9,3 +9,6 @@
- Suggar
- Vinegar
- Oil
- +Banana
- +Pear
- +Apple
-
-Getting Ride of branchy history
-----------------------------------
-
-While I was working on my list. someone help made a change remotly.
-
- $ cd ../remote
- $ hg up -q
- $ sed -i'' -e 's/Spam/Spam Spam Spam/' shopping
- $ hg ci -m 'SPAM'
- $ cd ../local
-
-I'll get this remote changeset when pulling
-
- $ hg pull remote
- pulling from $TESTTMP/remote
- searching for changes
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 1 changes to 1 files (+1 heads)
- (run 'hg update' to get a working copy)
-
-I now have a new heads. Note that this remote head is immutable
-
- $ hg log -G
- o 9ca060c80d74 (public): SPAM
- |
- | @ 0cacb48f4482 (draft): adding fruit
- | |
- | o 4d5dc8187023 (draft): adding condiment
- |/
- o 7e82d3f3c2cb (public): Monthy Python Shopping list
-
-
-instead of merging my head with the new one. I'm going to rebase my work
-
- $ hg diff
- $ hg rebase -d 9ca060c80d74 -s 4d5dc8187023
- merging shopping
- merging shopping
-
-
-My local work is now rebased on the remote one.
-
- $ hg log -G
- @ 387187ad9bd9 (draft): adding fruit
- |
- o dfd3a2d7691e (draft): adding condiment
- |
- o 9ca060c80d74 (public): SPAM
- |
- o 7e82d3f3c2cb (public): Monthy Python Shopping list
-
-
-Removing changeset
-------------------------
-
-I add new item to my list
-
- $ cat >> shopping << EOF
- > car
- > bus
- > plane
- > boat
- > EOF
- $ hg ci -m 'transport'
- $ hg log -G
- @ d58c77aa15d7 (draft): transport
- |
- o 387187ad9bd9 (draft): adding fruit
- |
- o dfd3a2d7691e (draft): adding condiment
- |
- o 9ca060c80d74 (public): SPAM
- |
- o 7e82d3f3c2cb (public): Monthy Python Shopping list
-
-
-I have a new commit but I realize that don't want it. (transport shop list does
-not fit well in my standard shopping list)
-
- $ hg prune . # . is for working directory parent
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- working directory now at 387187ad9bd9
-
-The silly changeset is gone.
-
- $ hg log -G
- @ 387187ad9bd9 (draft): adding fruit
- |
- o dfd3a2d7691e (draft): adding condiment
- |
- o 9ca060c80d74 (public): SPAM
- |
- o 7e82d3f3c2cb (public): Monthy Python Shopping list
-
-
-Reordering changeset
-------------------------
-
-
-We create two changesets.
-
-
- $ cat >> shopping << EOF
- > Shampoo
- > Toothbrush
- > ... More bathroom stuff to come
- > Towel
- > Soap
- > EOF
- $ hg ci -m 'bathroom stuff' -q # XXX remove the -q
-
- $ sed -i'' -e 's/Spam/Spam Spam Spam/g' shopping
- $ hg ci -m 'SPAM SPAM'
- $ hg log -G
- @ c48f32fb1787 (draft): SPAM SPAM
- |
- o 8d39a843582d (draft): bathroom stuff
- |
- o 387187ad9bd9 (draft): adding fruit
- |
- o dfd3a2d7691e (draft): adding condiment
- |
- o 9ca060c80d74 (public): SPAM
- |
- o 7e82d3f3c2cb (public): Monthy Python Shopping list
-
-
-.. note: don't amend changeset 7e82d3f3c2cb or 9ca060c80d74 as they are immutable.
-
-I now want to push to remote all my change but the bathroom one that i'm not
-totally happy with yet. To be able to push "SPAM SPAM" I need a version of "SPAM SPAM" not children of
-"bathroom stuff"
-
-You can use 'rebase -r' or 'graft -O' for that:
-
- $ hg up 'p1(8d39a843582d)' # going on "bathroom stuff" parent
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ hg graft -O c48f32fb1787 # moving "SPAM SPAM" to the working directory parent
- grafting revision 10
- merging shopping
- $ hg log -G
- @ a2fccc2e7b08 (draft): SPAM SPAM
- |
- | o 8d39a843582d (draft): bathroom stuff
- |/
- o 387187ad9bd9 (draft): adding fruit
- |
- o dfd3a2d7691e (draft): adding condiment
- |
- o 9ca060c80d74 (public): SPAM
- |
- o 7e82d3f3c2cb (public): Monthy Python Shopping list
-
-
-We have a new SPAM SPAM version without the bathroom stuff
-
- $ grep Spam shopping # enouth spam
- Spam Spam Spam Spam Spam Spam Spam Spam Spam
- $ grep Toothbrush shopping # no Toothbrush
- [1]
- $ hg export .
- # HG changeset patch
- # User test
- # Date 0 0
- # Node ID a2fccc2e7b08bbce6af7255b989453f7089e4cf0
- # Parent 387187ad9bd9d8f9a00a9fa804a26231db547429
- SPAM SPAM
-
- diff --git a/shopping b/shopping
- --- a/shopping
- +++ b/shopping
- @@ -1,4 +1,4 @@
- -Spam Spam Spam
- +Spam Spam Spam Spam Spam Spam Spam Spam Spam
- Whizzo butter
- Albatross
- Rat (rather a lot)
-
-To make sure I do not push unready changeset by mistake I set the "bathroom
-stuff" changeset in the secret phase.
-
- $ hg phase --force --secret 8d39a843582d
-
-we can now push our change:
-
- $ hg push remote
- pushing to $TESTTMP/remote
- searching for changes
- adding changesets
- adding manifests
- adding file changes
- added 3 changesets with 3 changes to 1 files
-
-for simplicity shake we get the bathroom change in line again
-
- $ hg rebase -Dr 8d39a843582d -d a2fccc2e7b08
- merging shopping
- $ hg phase --draft .
- $ hg log -G
- @ 8a79ae8b029e (draft): bathroom stuff
- |
- o a2fccc2e7b08 (public): SPAM SPAM
- |
- o 387187ad9bd9 (public): adding fruit
- |
- o dfd3a2d7691e (public): adding condiment
- |
- o 9ca060c80d74 (public): SPAM
- |
- o 7e82d3f3c2cb (public): Monthy Python Shopping list
-
-
-
-
-Splitting change
-------------------
-
-To be done (currently achieve with "two commit + debugobsolete")
-
-Collapsing change
-------------------
-
-To be done (currently achieve with "revert + debugobsolete" or "rebase --collapse")
-
-
-
-
-
-
------------------------
-Collaboration
------------------------
-
-
-sharing mutable changeset
-----------------------------
-
-To share mutable changeset with other just check that the repo you interact
-with is "not publishing". Otherwise you will get the previously observe
-behavior where exchanged changeset are automatically published.
-
- $ cd ../remote
- $ hg -R ../local/ showconfig phases
-
-the localrepo does not have any specific configuration for `phases.publish`. It
-is ``true`` by default.
-
- $ hg pull local
- pulling from $TESTTMP/local
- searching for changes
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 1 changes to 1 files
- (run 'hg update' to get a working copy)
- $ hg log -G
- o 8a79ae8b029e (public): bathroom stuff
- |
- o a2fccc2e7b08 (public): SPAM SPAM
- |
- o 387187ad9bd9 (public): adding fruit
- |
- o dfd3a2d7691e (public): adding condiment
- |
- @ 9ca060c80d74 (public): SPAM
- |
- o 7e82d3f3c2cb (public): Monthy Python Shopping list
-
-
-
-
-We do not want to publish the "bathroom changeset". Let's rollback the last transaction
-
- $ hg rollback
- repository tip rolled back to revision 4 (undo pull)
- $ hg log -G
- o a2fccc2e7b08 (public): SPAM SPAM
- |
- o 387187ad9bd9 (public): adding fruit
- |
- o dfd3a2d7691e (public): adding condiment
- |
- @ 9ca060c80d74 (public): SPAM
- |
- o 7e82d3f3c2cb (public): Monthy Python Shopping list
-
-
-Let's make the local repo "non publishing"
-
- $ echo '[phases]' >> ../local/.hg/hgrc
- $ echo 'publish=false' >> ../local/.hg/hgrc
- $ echo '[phases]' >> .hg/hgrc
- $ echo 'publish=false' >> .hg/hgrc
- $ hg showconfig phases
- phases.publish=false
- $ hg -R ../local/ showconfig phases
- phases.publish=false
-
-
-I can now exchange mutable changeset between "remote" and "local" repository.
-
- $ hg pull local
- pulling from $TESTTMP/local
- searching for changes
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 1 changes to 1 files
- (run 'hg update' to get a working copy)
- $ hg log -G
- o 8a79ae8b029e (draft): bathroom stuff
- |
- o a2fccc2e7b08 (public): SPAM SPAM
- |
- o 387187ad9bd9 (public): adding fruit
- |
- o dfd3a2d7691e (public): adding condiment
- |
- @ 9ca060c80d74 (public): SPAM
- |
- o 7e82d3f3c2cb (public): Monthy Python Shopping list
-
-
-Rebasing unstable change after pull
-----------------------------------------------
-
-Remotely someone add a new changeset on top of the mutable "bathroom" on.
-
- $ hg up 8a79ae8b029e -q
- $ cat >> shopping << EOF
- > Giraffe
- > Rhino
- > Lion
- > Bear
- > EOF
- $ hg ci -m 'animals'
-
-But at the same time, locally, this same "bathroom changeset" was updated.
-
- $ cd ../local
- $ hg up 8a79ae8b029e -q
- $ sed -i'' -e 's/... More bathroom stuff to come/Bath Robe/' shopping
- $ hg amend
- $ hg log -G
- @ ffa278c50818 (draft): bathroom stuff
- |
- o a2fccc2e7b08 (public): SPAM SPAM
- |
- o 387187ad9bd9 (public): adding fruit
- |
- o dfd3a2d7691e (public): adding condiment
- |
- o 9ca060c80d74 (public): SPAM
- |
- o 7e82d3f3c2cb (public): Monthy Python Shopping list
-
-
-
-When we pull from remote again we get an unstable state!
-
-
- $ hg pull remote
- pulling from $TESTTMP/remote
- searching for changes
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 1 changes to 1 files (+1 heads)
- (run 'hg heads .' to see heads, 'hg merge' to merge)
- 1 new unstables changesets
-
-
-The new changeset "animal" is based one an old changeset of "bathroom". You can
-see both version showing up in the log.
-
- $ hg log -G
- o 9ac5d0e790a2 (draft): animals
- |
- | @ ffa278c50818 (draft): bathroom stuff
- | |
- o | 8a79ae8b029e (draft): bathroom stuff
- |/
- o a2fccc2e7b08 (public): SPAM SPAM
- |
- o 387187ad9bd9 (public): adding fruit
- |
- o dfd3a2d7691e (public): adding condiment
- |
- o 9ca060c80d74 (public): SPAM
- |
- o 7e82d3f3c2cb (public): Monthy Python Shopping list
-
-
-The older version 8a79ae8b029e never ceased to exist in the local repo. It was
-jsut hidden and excluded from pull and push.
-
-.. note:: In hgview there is a nice doted relation highlighting ffa278c50818 as a new version of 8a79ae8b029e. this is not yet ported to graphlog.
-
-Their is **unstable** changeset in this history now. Mercurial will refuse to
-share it with the outside:
-
- $ hg push other
- pushing to $TESTTMP/other
- searching for changes
- abort: push includes an unstable changeset: 9ac5d0e790a2!
- (use 'hg stabilize' to get a stable history (or --force to proceed))
- [255]
-
-
-
-
-To resolve this unstable state, you need to rebase 9ac5d0e790a2 onto
-ffa278c50818 the "hg stabilize" command will make this for you.
-
-It has a --dry-run option to only suggest the next move.
-
- $ hg stabilize --dry-run
- move:[15] animals
- atop:[14] bathroom stuff
- hg rebase -Dr 9ac5d0e790a2 -d ffa278c50818
-
-Let's do it
-
- $ hg rebase -Dr 9ac5d0e790a2 -d ffa278c50818
- merging shopping
-
-The old version of bathroom is hidden again.
-
- $ hg log -G
- @ 437efbcaf700 (draft): animals
- |
- o ffa278c50818 (draft): bathroom stuff
- |
- o a2fccc2e7b08 (public): SPAM SPAM
- |
- o 387187ad9bd9 (public): adding fruit
- |
- o dfd3a2d7691e (public): adding condiment
- |
- o 9ca060c80d74 (public): SPAM
- |
- o 7e82d3f3c2cb (public): Monthy Python Shopping list
-
-
-
-We can push this evolution to remote
-
- $ hg push remote
- pushing to $TESTTMP/remote
- searching for changes
- adding changesets
- adding manifests
- adding file changes
- added 2 changesets with 2 changes to 1 files (+1 heads)
-
-remote get a warning that current working directory is based on an obsolete changeset
-
- $ cd ../remote
- $ hg pull local # we up again to trigger the warning. it was displayed during the push
- pulling from $TESTTMP/local
- searching for changes
- no changes found
- Working directory parent is obsolete
-
- $ hg up 437efbcaf700
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-
-Relocating unstable change after prune
-----------------------------------------------
-
-The remote guy keep working
-
- $ sed -i'' -e 's/Spam/Spam Spam Spam Spam/g' shopping
- $ hg commit -m "SPAM SPAM SPAM"
-
-I'm pulling its work locally.
-
- $ cd ../local
- $ hg pull remote
- pulling from $TESTTMP/remote
- searching for changes
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 1 changes to 1 files
- (run 'hg update' to get a working copy)
- $ hg log -G
- o ae45c0c3092a (draft): SPAM SPAM SPAM
- |
- @ 437efbcaf700 (draft): animals
- |
- o ffa278c50818 (draft): bathroom stuff
- |
- o a2fccc2e7b08 (public): SPAM SPAM
- |
- o 387187ad9bd9 (public): adding fruit
- |
- o dfd3a2d7691e (public): adding condiment
- |
- o 9ca060c80d74 (public): SPAM
- |
- o 7e82d3f3c2cb (public): Monthy Python Shopping list
-
-
-In the mean time I noticed you can't buy animals in a super market and I prune the animal changeset:
-
- $ hg prune 437efbcaf700
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- working directory now at ffa278c50818
- 1 new unstables changesets
-
-
-The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset
-is neither dead or obsolete. My repository is in an unstable state again.
-
- $ hg log -G
- o ae45c0c3092a (draft): SPAM SPAM SPAM
- |
- o 437efbcaf700 (draft): animals
- |
- @ ffa278c50818 (draft): bathroom stuff
- |
- o a2fccc2e7b08 (public): SPAM SPAM
- |
- o 387187ad9bd9 (public): adding fruit
- |
- o dfd3a2d7691e (public): adding condiment
- |
- o 9ca060c80d74 (public): SPAM
- |
- o 7e82d3f3c2cb (public): Monthy Python Shopping list
-
-
- $ hg log -r 'unstable()'
- ae45c0c3092a (draft): SPAM SPAM SPAM
-
-# XXX make prune stabilization works
-# $ hg stabilize --any
-# merging shopping
-
- $ hg graft -O ae45c0c3092a
- grafting revision 17
- merging shopping
-
- $ hg log -G
- @ 20de1fb1cec5 (draft): SPAM SPAM SPAM
- |
- o ffa278c50818 (draft): bathroom stuff
- |
- o a2fccc2e7b08 (public): SPAM SPAM
- |
- o 387187ad9bd9 (public): adding fruit
- |
- o dfd3a2d7691e (public): adding condiment
- |
- o 9ca060c80d74 (public): SPAM
- |
- o 7e82d3f3c2cb (public): Monthy Python Shopping list
-
-
-
-Handling Conflicting amend
-----------------------------------------------
-
-We can detect that multiple diverging//conflicting amend have been made. There
-will be a "evol-merge" command to merge conflicting amend
-
-This command is not ready yet.
+../../tests/test-tutorial.t
\ No newline at end of file
--- a/enable.sh Thu Aug 23 18:09:45 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-here=`python -c "import os; print os.path.realpath('$0')"`
-repo_root=`dirname "$here"`
-
-if !( hg --version -q | grep -qe 'version 2\.[2-9]' ); then
- echo 'You need mercurial 2.2 or later' >&2
- exit 2
-fi
-
-
-
-cat << EOF >&2
-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXX Add lines below to the [extensions] section of you hgrc XXX
-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-
-
-EOF
-
-cat << EOF | sed -e "s#XXXREPOPATHXXX#${repo_root}#"
-[extensions]
-### experimental extensions for history rewriting
-
-# obsolete relation support (will move in core)
-obsolete=XXXREPOPATHXXX/hgext/obsolete.py
-
-# history rewriting UI
-# needed by evolve
-hgext.rebase=
-evolve=XXXREPOPATHXXX/hgext/evolve.py
-
-
-[alias]
-### useful alias to check future amend result
-# equivalent to the qdiff command for mq
-
-# diff
-pdiff=diff --rev .^
-
-# status
-pstatus=status --rev .^
-
-# diff with the previous amend
-odiff=diff --rev 'limit(precursors(.),1)' --rev .
-EOF
-
-cat << EOF >&2
-
-
-### check qsync-enable.sh if your need mq export too.
-EOF
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hgext/__init__.py Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,1 @@
+# Copyright 2011 Logilab SA <contact@logilab.fr>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hgext/drophack.py Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,162 @@
+# This software may be used and distributed according to the terms of the
+# GNU General Public License version 2 or any later version.
+'''This extension add a hacky command to drop changeset during review
+
+This extension is intended as a temporary hack to allow Matt Mackall to use
+evolve in the Mercurial review it self. You should probably not use it if your
+name is not Matt Mackall.
+'''
+
+import os
+import time
+import contextlib
+
+from mercurial.i18n import _
+from mercurial import cmdutil
+from mercurial import repair
+from mercurial import scmutil
+from mercurial import lock as lockmod
+from mercurial import util
+from mercurial import commands
+
+cmdtable = {}
+command = cmdutil.command(cmdtable)
+
+
+@contextlib.contextmanager
+def timed(ui, caption):
+ ostart = os.times()
+ cstart = time.time()
+ yield
+ cstop = time.time()
+ ostop = os.times()
+ wall = cstop - cstart
+ user = ostop[0] - ostart[0]
+ sys = ostop[1] - ostart[1]
+ comb = user + sys
+ ui.write("%s: wall %f comb %f user %f sys %f\n"
+ % (caption, wall, comb, user, sys))
+
+def obsmarkerchainfrom(obsstore, nodes):
+ """return all marker chain starting from node
+
+ Starting from mean "use as successors"."""
+ # XXX need something smarter for descendant of bumped changeset
+ seennodes = set(nodes)
+ seenmarkers = set()
+ pendingnodes = set(nodes)
+ precursorsmarkers = obsstore.precursors
+ while pendingnodes:
+ current = pendingnodes.pop()
+ new = set()
+ for precmark in precursorsmarkers.get(current, ()):
+ if precmark in seenmarkers:
+ continue
+ seenmarkers.add(precmark)
+ new.add(precmark[0])
+ yield precmark
+ new -= seennodes
+ pendingnodes |= new
+
+def stripmarker(ui, repo, markers):
+ """remove <markers> from the repo obsstore
+
+ The old obsstore content is saved in a `obsstore.prestrip` file
+ """
+ repo = repo.unfiltered()
+ repo.destroying()
+ oldmarkers = list(repo.obsstore._all)
+ util.rename(repo.sjoin('obsstore'),
+ repo.join('obsstore.prestrip'))
+ del repo.obsstore # drop the cache
+ newstore = repo.obsstore
+ assert not newstore # should be empty after rename
+ newmarkers = [m for m in oldmarkers if m not in markers]
+ tr = repo.transaction('drophack')
+ try:
+ newstore.add(tr, newmarkers)
+ tr.close()
+ finally:
+ tr.release()
+ repo.destroyed()
+
+
+@command('drop', [('r', 'rev', [], 'revision to update')], _('[-r] revs'))
+def cmddrop(ui, repo, *revs, **opts):
+ """I'm hacky do not use me!
+
+ This command strip a changeset, its precursors and all obsolescence marker
+ associated to its chain.
+
+ There is no way to limit the extend of the purge yet. You may have to
+ repull from other source to get some changeset and obsolescence marker
+ back.
+
+ This intended for Matt Mackall usage only. do not use me.
+ """
+ revs = list(revs)
+ revs.extend(opts['rev'])
+ if not revs:
+ revs = ['.']
+ # get the changeset
+ revs = scmutil.revrange(repo, revs)
+ if not revs:
+ ui.write_err('no revision to drop\n')
+ return 1
+ # lock from the beginning to prevent race
+ wlock = lock = None
+ try:
+ lock = repo.wlock()
+ lock = repo.lock()
+ # check they have no children
+ if repo.revs('%ld and public()', revs):
+ ui.write_err('cannot drop public revision')
+ return 1
+ if repo.revs('children(%ld) - %ld', revs, revs):
+ ui.write_err('cannot drop revision with children')
+ return 1
+ if repo.revs('. and %ld', revs):
+ newrevs = repo.revs('max(::. - %ld)', revs)
+ if newrevs:
+ assert len(newrevs) == 1
+ newrev = newrevs[0]
+ else:
+ newrev = -1
+ commands.update(ui, repo, newrev)
+ ui.status(_('working directory now at %s\n') % repo[newrev])
+ # get all markers and successors up to root
+ nodes = [repo[r].node() for r in revs]
+ with timed(ui, 'search obsmarker'):
+ markers = set(obsmarkerchainfrom(repo.obsstore, nodes))
+ ui.write('%i obsmarkers found\n' % len(markers))
+ cl = repo.unfiltered().changelog
+ with timed(ui, 'search nodes'):
+ allnodes = set(nodes)
+ allnodes.update(m[0] for m in markers if cl.hasnode(m[0]))
+ ui.write('%i nodes found\n' % len(allnodes))
+ cl = repo.changelog
+ visiblenodes = set(n for n in allnodes if cl.hasnode(n))
+ # check constraint again
+ if repo.revs('%ln and public()', visiblenodes):
+ ui.write_err('cannot drop public revision')
+ return 1
+ if repo.revs('children(%ln) - %ln', visiblenodes, visiblenodes):
+ ui.write_err('cannot drop revision with children')
+ return 1
+
+ if markers:
+ # strip them
+ with timed(ui, 'strip obsmarker'):
+ stripmarker(ui, repo, markers)
+ # strip the changeset
+ with timed(ui, 'strip nodes'):
+ repair.strip(ui, repo, allnodes, backup="all", topic='drophack')
+
+ finally:
+ lockmod.release(lock, wlock)
+
+ # rewrite the whole file.
+ # print data.
+ # - time to compute the chain
+ # - time to strip the changeset
+ # - time to strip the obs marker.
--- a/hgext/evolve.py Thu Aug 23 18:09:45 2012 +0200
+++ b/hgext/evolve.py Thu Jun 26 15:27:25 2014 +0100
@@ -1,38 +1,723 @@
-# states.py - introduce the state concept for mercurial changeset
-#
# Copyright 2011 Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
# Logilab SA <contact@logilab.fr>
# Pierre-Yves David <pierre-yves.david@ens-lyon.org>
+# Patrick Mezard <patrick@mezard.eu>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
-'''a set of commands to handle changeset mutation'''
+'''extends Mercurial feature related to Changeset Evolution
+
+This extension provides several commands to mutate history and deal with
+issues it may raise.
+
+It also:
+
+ - enables the "Changeset Obsolescence" feature of mercurial,
+ - alters core commands and extensions that rewrite history to use
+ this feature,
+ - improves some aspect of the early implementation in 2.3
+'''
+
+testedwith = '3.0.1'
+buglink = 'https://bitbucket.org/marmoute/mutable-history/issues'
+import sys
+import random
+from StringIO import StringIO
+import struct
+import urllib
+
+import mercurial
+from mercurial import util
+
+try:
+ from mercurial import obsolete
+ if not obsolete._enabled:
+ obsolete._enabled = True
+ from mercurial import wireproto
+ gboptslist = getattr(wireproto, 'gboptslist', None)
+ gboptsmap = getattr(wireproto, 'gboptsmap', None)
+except (ImportError, AttributeError):
+ gboptslist = gboptsmap = None
+
+
+from mercurial import base85
+from mercurial import bookmarks
from mercurial import cmdutil
-from mercurial import scmutil
-from mercurial import node
-from mercurial import error
-from mercurial import extensions
-from mercurial import commands
-from mercurial import bookmarks
-from mercurial import phases
from mercurial import commands
from mercurial import context
from mercurial import copies
-from mercurial import util
+from mercurial import error
+from mercurial import exchange
+from mercurial import extensions
+from mercurial import httppeer
+from mercurial import hg
+from mercurial import lock as lockmod
+from mercurial import merge
+from mercurial import node
+from mercurial import phases
+from mercurial import patch
+from mercurial import revset
+from mercurial import scmutil
+from mercurial import templatekw
from mercurial.i18n import _
-from mercurial.commands import walkopts, commitopts, commitopts2, logopts
-from mercurial import hg
+from mercurial.commands import walkopts, commitopts, commitopts2
+from mercurial.node import nullid
+from mercurial import wireproto
+from mercurial import localrepo
+from mercurial.hgweb import hgweb_mod
+from mercurial import bundle2
+
+_pack = struct.pack
+
+if gboptsmap is not None:
+ memfilectx = context.memfilectx
+elif gboptslist is not None:
+ oldmemfilectx = context.memfilectx
+ def memfilectx(repo, *args, **kwargs):
+ return oldmemfilectx(*args, **kwargs)
+else:
+ raise util.Abort('Your Mercurial is too old for this version of Evolve\n'
+ 'requires version 3.0.1 or above')
+
+
+# This extension contains the following code
+#
+# - Extension Helper code
+# - Obsolescence cache
+# - ...
+# - Older format compat
+
+
+
+#####################################################################
+### Extension helper ###
+#####################################################################
+
+class exthelper(object):
+ """Helper for modular extension setup
+
+ A single helper should be instanciated for each extension. Helper
+ methods are then used as decorator for various purpose.
+
+ All decorators return the original function and may be chained.
+ """
+
+ def __init__(self):
+ self._uicallables = []
+ self._extcallables = []
+ self._repocallables = []
+ self._revsetsymbols = []
+ self._templatekws = []
+ self._commandwrappers = []
+ self._extcommandwrappers = []
+ self._functionwrappers = []
+ self._duckpunchers = []
+
+ def final_uisetup(self, ui):
+ """Method to be used as the extension uisetup
+
+ The following operations belong here:
+
+ - Changes to ui.__class__ . The ui object that will be used to run the
+ command has not yet been created. Changes made here will affect ui
+ objects created after this, and in particular the ui that will be
+ passed to runcommand
+ - Command wraps (extensions.wrapcommand)
+ - Changes that need to be visible to other extensions: because
+ initialization occurs in phases (all extensions run uisetup, then all
+ run extsetup), a change made here will be visible to other extensions
+ during extsetup
+ - Monkeypatch or wrap function (extensions.wrapfunction) of dispatch
+ module members
+ - Setup of pre-* and post-* hooks
+ - pushkey setup
+ """
+ for cont, funcname, func in self._duckpunchers:
+ setattr(cont, funcname, func)
+ for command, wrapper in self._commandwrappers:
+ extensions.wrapcommand(commands.table, command, wrapper)
+ for cont, funcname, wrapper in self._functionwrappers:
+ extensions.wrapfunction(cont, funcname, wrapper)
+ for c in self._uicallables:
+ c(ui)
+
+ def final_extsetup(self, ui):
+ """Method to be used as a the extension extsetup
+
+ The following operations belong here:
+
+ - Changes depending on the status of other extensions. (if
+ extensions.find('mq'))
+ - Add a global option to all commands
+ - Register revset functions
+ """
+ knownexts = {}
+ for name, symbol in self._revsetsymbols:
+ revset.symbols[name] = symbol
+ for name, kw in self._templatekws:
+ templatekw.keywords[name] = kw
+ for ext, command, wrapper in self._extcommandwrappers:
+ if ext not in knownexts:
+ e = extensions.find(ext)
+ if e is None:
+ raise util.Abort('extension %s not found' % ext)
+ knownexts[ext] = e.cmdtable
+ extensions.wrapcommand(knownexts[ext], commands, wrapper)
+ for c in self._extcallables:
+ c(ui)
+
+ def final_reposetup(self, ui, repo):
+ """Method to be used as a the extension reposetup
+
+ The following operations belong here:
+
+ - All hooks but pre-* and post-*
+ - Modify configuration variables
+ - Changes to repo.__class__, repo.dirstate.__class__
+ """
+ for c in self._repocallables:
+ c(ui, repo)
+
+ def uisetup(self, call):
+ """Decorated function will be executed during uisetup
+
+ example::
+
+ @eh.uisetup
+ def setupbabar(ui):
+ print 'this is uisetup!'
+ """
+ self._uicallables.append(call)
+ return call
+
+ def extsetup(self, call):
+ """Decorated function will be executed during extsetup
+
+ example::
+
+ @eh.extsetup
+ def setupcelestine(ui):
+ print 'this is extsetup!'
+ """
+ self._extcallables.append(call)
+ return call
+
+ def reposetup(self, call):
+ """Decorated function will be executed during reposetup
+
+ example::
+
+ @eh.reposetup
+ def setupzephir(ui, repo):
+ print 'this is reposetup!'
+ """
+ self._repocallables.append(call)
+ return call
+
+ def revset(self, symbolname):
+ """Decorated function is a revset symbol
+
+ The name of the symbol must be given as the decorator argument.
+ The symbol is added during `extsetup`.
+
+ example::
+
+ @eh.revset('hidden')
+ def revsetbabar(repo, subset, x):
+ args = revset.getargs(x, 0, 0, 'babar accept no argument')
+ return [r for r in subset if 'babar' in repo[r].description()]
+ """
+ def dec(symbol):
+ self._revsetsymbols.append((symbolname, symbol))
+ return symbol
+ return dec
+
+
+ def templatekw(self, keywordname):
+ """Decorated function is a revset keyword
+
+ The name of the keyword must be given as the decorator argument.
+ The symbol is added during `extsetup`.
+
+ example::
+
+ @eh.templatekw('babar')
+ def kwbabar(ctx):
+ return 'babar'
+ """
+ def dec(keyword):
+ self._templatekws.append((keywordname, keyword))
+ return keyword
+ return dec
+
+ def wrapcommand(self, command, extension=None):
+ """Decorated function is a command wrapper
+
+ The name of the command must be given as the decorator argument.
+ The wrapping is installed during `uisetup`.
+
+ If the second option `extension` argument is provided, the wrapping
+ will be applied in the extension commandtable. This argument must be a
+ string that will be searched using `extension.find` if not found and
+ Abort error is raised. If the wrapping applies to an extension, it is
+ installed during `extsetup`
+
+ example::
+
+ @eh.wrapcommand('summary')
+ def wrapsummary(orig, ui, repo, *args, **kwargs):
+ ui.note('Barry!')
+ return orig(ui, repo, *args, **kwargs)
+
+ """
+ def dec(wrapper):
+ if extension is None:
+ self._commandwrappers.append((command, wrapper))
+ else:
+ self._extcommandwrappers.append((extension, command, wrapper))
+ return wrapper
+ return dec
+
+ def wrapfunction(self, container, funcname):
+ """Decorated function is a function wrapper
+
+ This function takes two arguments, the container and the name of the
+ function to wrap. The wrapping is performed during `uisetup`.
+ (there is no extension support)
+
+ example::
+
+ @eh.function(discovery, 'checkheads')
+ def wrapfunction(orig, *args, **kwargs):
+ ui.note('His head smashed in and his heart cut out')
+ return orig(*args, **kwargs)
+ """
+ def dec(wrapper):
+ self._functionwrappers.append((container, funcname, wrapper))
+ return wrapper
+ return dec
+
+ def addattr(self, container, funcname):
+ """Decorated function is to be added to the container
+
+ This function takes two arguments, the container and the name of the
+ function to wrap. The wrapping is performed during `uisetup`.
+
+ example::
+
+ @eh.function(context.changectx, 'babar')
+ def babar(ctx):
+ return 'babar' in ctx.description
+ """
+ def dec(func):
+ self._duckpunchers.append((container, funcname, func))
+ return func
+ return dec
+
+eh = exthelper()
+uisetup = eh.final_uisetup
+extsetup = eh.final_extsetup
+reposetup = eh.final_reposetup
+
+#####################################################################
+### experimental behavior ###
+#####################################################################
+
+@eh.wrapfunction(mercurial.obsolete, 'createmarkers')
+def _createmarkers(orig, repo, relations, *args, **kwargs):
+ """register parent information at prune time"""
+ # every time this test is run, a kitten is slain.
+ # Change it as soon as possible
+ if '[,{metadata}]' in orig.__doc__:
+ relations = list(relations)
+ for idx, rel in enumerate(relations):
+ prec = rel[0]
+ sucs = rel[1]
+ if not sucs:
+ meta = {}
+ if 2 < len(rel):
+ meta.update(rel[2])
+ for i, p in enumerate(prec.parents(), 1):
+ meta['p%i' % i] = p.hex()
+ relations[idx] = (prec, sucs, meta)
+ return orig(repo, relations, *args, **kwargs)
+
+def createmarkers(*args, **kwargs):
+ return obsolete.createmarkers(*args, **kwargs)
+
+class pruneobsstore(obsolete.obsstore):
+
+ def __init__(self, *args, **kwargs):
+ self.prunedchildren = {}
+ return super(pruneobsstore, self).__init__(*args, **kwargs)
+
+ def _load(self, markers):
+ markers = self._prunedetectingmarkers(markers)
+ return super(pruneobsstore, self)._load(markers)
+
+
+ def _prunedetectingmarkers(self, markers):
+ for m in markers:
+ if not m[1]: # no successors
+ meta = obsolete.decodemeta(m[3])
+ if 'p1' in meta:
+ p1 = node.bin(meta['p1'])
+ self.prunedchildren.setdefault(p1, set()).add(m)
+ if 'p2' in meta:
+ p2 = node.bin(meta['p2'])
+ self.prunedchildren.setdefault(p2, set()).add(m)
+ yield m
+
+obsolete.obsstore = pruneobsstore
+
+#####################################################################
+### Critical fix ###
+#####################################################################
+
+@eh.wrapfunction(mercurial.obsolete, '_readmarkers')
+def safereadmarkers(orig, data):
+ """safe maker wrapper to remove nullid succesors
+
+ Nullid successors was created by older version of evolve.
+ """
+ nb = 0
+ for marker in orig(data):
+ if nullid in marker[1]:
+ marker = (marker[0],
+ tuple(s for s in marker[1] if s != nullid),
+ marker[2],
+ marker[3])
+ nb += 1
+ yield marker
+ if nb:
+ e = sys.stderr
+ print >> e, 'repo contains %i invalid obsolescence markers' % nb
+
+getrevs = obsolete.getrevs
+
+#####################################################################
+### Additional Utilities ###
+#####################################################################
+
+# This section contains a lot of small utility function and method
+
+# - Function to create markers
+# - useful alias pstatus and pdiff (should probably go in evolve)
+# - "troubles" method on changectx
+# - function to travel throught the obsolescence graph
+# - function to find useful changeset to stabilize
+
+
+### Useful alias
+
+@eh.uisetup
+def _installalias(ui):
+ if ui.config('alias', 'pstatus', None) is None:
+ ui.setconfig('alias', 'pstatus', 'status --rev .^')
+ if ui.config('alias', 'pdiff', None) is None:
+ ui.setconfig('alias', 'pdiff', 'diff --rev .^')
+ if ui.config('alias', 'olog', None) is None:
+ ui.setconfig('alias', 'olog', "log -r 'precursors(.)' --hidden")
+ if ui.config('alias', 'odiff', None) is None:
+ ui.setconfig('alias', 'odiff',
+ "diff --hidden --rev 'limit(precursors(.),1)' --rev .")
+ if ui.config('alias', 'grab', None) is None:
+ ui.setconfig('alias', 'grab',
+ "! $HG rebase --dest . --rev $@ && $HG up tip")
+
+
+### Troubled revset symbol
+
+@eh.revset('troubled')
+def revsettroubled(repo, subset, x):
+ """``troubled()``
+ Changesets with troubles.
+ """
+ _ = revset.getargs(x, 0, 0, 'troubled takes no arguments')
+ return repo.revs('%ld and (unstable() + bumped() + divergent())',
+ subset)
+
+
+### Obsolescence graph
+
+# XXX SOME MAJOR CLEAN UP TO DO HERE XXX
+
+def _precursors(repo, s):
+ """Precursor of a changeset"""
+ cs = set()
+ nm = repo.changelog.nodemap
+ markerbysubj = repo.obsstore.precursors
+ for r in s:
+ for p in markerbysubj.get(repo[r].node(), ()):
+ pr = nm.get(p[0])
+ if pr is not None:
+ cs.add(pr)
+ return cs
+
+def _allprecursors(repo, s): # XXX we need a better naming
+ """transitive precursors of a subset"""
+ toproceed = [repo[r].node() for r in s]
+ seen = set()
+ allsubjects = repo.obsstore.precursors
+ while toproceed:
+ nc = toproceed.pop()
+ for mark in allsubjects.get(nc, ()):
+ np = mark[0]
+ if np not in seen:
+ seen.add(np)
+ toproceed.append(np)
+ nm = repo.changelog.nodemap
+ cs = set()
+ for p in seen:
+ pr = nm.get(p)
+ if pr is not None:
+ cs.add(pr)
+ return cs
+
+def _successors(repo, s):
+ """Successors of a changeset"""
+ cs = set()
+ nm = repo.changelog.nodemap
+ markerbyobj = repo.obsstore.successors
+ for r in s:
+ for p in markerbyobj.get(repo[r].node(), ()):
+ for sub in p[1]:
+ sr = nm.get(sub)
+ if sr is not None:
+ cs.add(sr)
+ return cs
+
+def _allsuccessors(repo, s, haltonflags=0): # XXX we need a better naming
+ """transitive successors of a subset
+
+ haltonflags allows to provide flags which prevent the evaluation of a
+ marker. """
+ toproceed = [repo[r].node() for r in s]
+ seen = set()
+ allobjects = repo.obsstore.successors
+ while toproceed:
+ nc = toproceed.pop()
+ for mark in allobjects.get(nc, ()):
+ if mark[2] & haltonflags:
+ continue
+ for sub in mark[1]:
+ if sub == nullid:
+ continue # should not be here!
+ if sub not in seen:
+ seen.add(sub)
+ toproceed.append(sub)
+ nm = repo.changelog.nodemap
+ cs = set()
+ for s in seen:
+ sr = nm.get(s)
+ if sr is not None:
+ cs.add(sr)
+ return cs
+
+
+
+
+#####################################################################
+### Extending revset and template ###
+#####################################################################
+
+# this section add several useful revset symbol not yet in core.
+# they are subject to changes
+
+
+### XXX I'm not sure this revset is useful
+@eh.revset('suspended')
+def revsetsuspended(repo, subset, x):
+ """``suspended()``
+ Obsolete changesets with non-obsolete descendants.
+ """
+ args = revset.getargs(x, 0, 0, 'suspended takes no arguments')
+ suspended = getrevs(repo, 'suspended')
+ return [r for r in subset if r in suspended]
+
+
+@eh.revset('precursors')
+def revsetprecursors(repo, subset, x):
+ """``precursors(set)``
+ Immediate precursors of changesets in set.
+ """
+ s = revset.getset(repo, range(len(repo)), x)
+ cs = _precursors(repo, s)
+ return [r for r in subset if r in cs]
+
+
+@eh.revset('allprecursors')
+def revsetallprecursors(repo, subset, x):
+ """``allprecursors(set)``
+ Transitive precursors of changesets in set.
+ """
+ s = revset.getset(repo, range(len(repo)), x)
+ cs = _allprecursors(repo, s)
+ return [r for r in subset if r in cs]
+
+
+@eh.revset('successors')
+def revsetsuccessors(repo, subset, x):
+ """``successors(set)``
+ Immediate successors of changesets in set.
+ """
+ s = revset.getset(repo, range(len(repo)), x)
+ cs = _successors(repo, s)
+ return [r for r in subset if r in cs]
+
+@eh.revset('allsuccessors')
+def revsetallsuccessors(repo, subset, x):
+ """``allsuccessors(set)``
+ Transitive successors of changesets in set.
+ """
+ s = revset.getset(repo, range(len(repo)), x)
+ cs = _allsuccessors(repo, s)
+ return [r for r in subset if r in cs]
+
+### template keywords
+# XXX it does not handle troubles well :-/
+
+@eh.templatekw('obsolete')
+def obsoletekw(repo, ctx, templ, **args):
+ """:obsolete: String. The obsolescence level of the node, could be
+ ``stable``, ``unstable``, ``suspended`` or ``extinct``.
+ """
+ rev = ctx.rev()
+ if ctx.obsolete():
+ if ctx.extinct():
+ return 'extinct'
+ else:
+ return 'suspended'
+ elif ctx.unstable():
+ return 'unstable'
+ return 'stable'
+
+#####################################################################
+### Various trouble warning ###
+#####################################################################
+
+# This section take care of issue warning to the user when troubles appear
+
+@eh.wrapcommand("update")
+@eh.wrapcommand("parents")
+@eh.wrapcommand("pull")
+def wrapmayobsoletewc(origfn, ui, repo, *args, **opts):
+ """Warn that the working directory parent is an obsolete changeset"""
+ res = origfn(ui, repo, *args, **opts)
+ if repo['.'].obsolete():
+ ui.warn(_('working directory parent is obsolete!\n'))
+ return res
+
+# XXX this could wrap transaction code
+# XXX (but this is a bit a layer violation)
+@eh.wrapcommand("commit")
+@eh.wrapcommand("import")
+@eh.wrapcommand("push")
+@eh.wrapcommand("pull")
+@eh.wrapcommand("graft")
+@eh.wrapcommand("phase")
+@eh.wrapcommand("unbundle")
+def warnobserrors(orig, ui, repo, *args, **kwargs):
+ """display warning is the command resulted in more instable changeset"""
+ # part of the troubled stuff may be filtered (stash ?)
+ # This needs a better implementation but will probably wait for core.
+ filtered = repo.changelog.filteredrevs
+ priorunstables = len(set(getrevs(repo, 'unstable')) - filtered)
+ priorbumpeds = len(set(getrevs(repo, 'bumped')) - filtered)
+ priordivergents = len(set(getrevs(repo, 'divergent')) - filtered)
+ ret = orig(ui, repo, *args, **kwargs)
+ # workaround phase stupidity
+ #phases._filterunknown(ui, repo.changelog, repo._phasecache.phaseroots)
+ filtered = repo.changelog.filteredrevs
+ newunstables = \
+ len(set(getrevs(repo, 'unstable')) - filtered) - priorunstables
+ newbumpeds = \
+ len(set(getrevs(repo, 'bumped')) - filtered) - priorbumpeds
+ newdivergents = \
+ len(set(getrevs(repo, 'divergent')) - filtered) - priordivergents
+ if newunstables > 0:
+ ui.warn(_('%i new unstable changesets\n') % newunstables)
+ if newbumpeds > 0:
+ ui.warn(_('%i new bumped changesets\n') % newbumpeds)
+ if newdivergents > 0:
+ ui.warn(_('%i new divergent changesets\n') % newdivergents)
+ return ret
+
+@eh.reposetup
+def _repostabilizesetup(ui, repo):
+ """Add a hint for "hg evolve" when troubles make push fails
+ """
+ if not repo.local():
+ return
+
+ class evolvingrepo(repo.__class__):
+ def push(self, remote, *args, **opts):
+ """wrapper around pull that pull obsolete relation"""
+ try:
+ result = super(evolvingrepo, self).push(remote, *args, **opts)
+ except util.Abort, ex:
+ hint = _("use 'hg evolve' to get a stable history "
+ "or --force to ignore warnings")
+ if (len(ex.args) >= 1
+ and ex.args[0].startswith('push includes ')
+ and ex.hint is None):
+ ex.hint = hint
+ raise
+ return result
+ repo.__class__ = evolvingrepo
+
+def summaryhook(ui, repo):
+ def write(fmt, count):
+ s = fmt % count
+ if count:
+ ui.write(s)
+ else:
+ ui.note(s)
+
+ nbunstable = len(getrevs(repo, 'unstable'))
+ nbbumped = len(getrevs(repo, 'bumped'))
+ nbdivergent = len(getrevs(repo, 'divergent'))
+ write('unstable: %i changesets\n', nbunstable)
+ write('bumped: %i changesets\n', nbbumped)
+ write('divergent: %i changesets\n', nbdivergent)
+
+@eh.extsetup
+def obssummarysetup(ui):
+ cmdutil.summaryhooks.add('evolve', summaryhook)
+
+
+#####################################################################
+### Core Other extension compat ###
+#####################################################################
+
+
+@eh.extsetup
+def _rebasewrapping(ui):
+ # warning about more obsolete
+ try:
+ rebase = extensions.find('rebase')
+ if rebase:
+ extensions.wrapcommand(rebase.cmdtable, 'rebase', warnobserrors)
+ except KeyError:
+ pass # rebase not found
+ try:
+ histedit = extensions.find('histedit')
+ if histedit:
+ extensions.wrapcommand(histedit.cmdtable, 'histedit', warnobserrors)
+ except KeyError:
+ pass # rebase not found
+
+#####################################################################
+### Old Evolve extension content ###
+#####################################################################
+
+# XXX need clean up and proper sorting in other section
### util function
#############################
-def noderange(repo, revsets):
- """The same as revrange but return node"""
- return map(repo.changelog.node,
- scmutil.revrange(repo, revsets))
-
### changeset rewriting logic
#############################
@@ -79,20 +764,15 @@
if path in headmf:
fctx = head[path]
flags = fctx.flags()
- mctx = context.memfilectx(fctx.path(), fctx.data(),
- islink='l' in flags,
- isexec='x' in flags,
- copied=copied.get(path))
+ mctx = memfilectx(repo, fctx.path(), fctx.data(),
+ islink='l' in flags,
+ isexec='x' in flags,
+ copied=copied.get(path))
return mctx
raise IOError()
- if commitopts.get('message') and commitopts.get('logfile'):
- raise util.Abort(_('options --message and --logfile are mutually'
- ' exclusive'))
- if commitopts.get('logfile'):
- message= open(commitopts['logfile']).read()
- elif commitopts.get('message'):
- message = commitopts['message']
- else:
+
+ message = cmdutil.logmessage(repo.ui, commitopts)
+ if not message:
message = old.description()
user = commitopts.get('user') or old.user()
@@ -115,86 +795,74 @@
newid = repo.commitctx(new)
new = repo[newid]
created = len(repo) != revcount
- if created:
- updatebookmarks(newid)
- # add evolution metadata
- collapsed = set([u.node() for u in updates] + [old.node()])
- repo.addcollapsedobsolete(collapsed, new.node())
- else:
- # newid is an existing revision. It could make sense to
- # replace revisions with existing ones but probably not by
- # default.
- pass
+ updatebookmarks(newid)
finally:
wlock.release()
return newid, created
+class MergeFailure(util.Abort):
+ pass
+
def relocate(repo, orig, dest):
"""rewrite <rev> on dest"""
try:
+ if orig.rev() == dest.rev():
+ raise util.Abort(_('tried to relocate a node on top of itself'),
+ hint=_("This shouldn't happen. If you still "
+ "need to move changesets, please do so "
+ "manually with nothing to rebase - working "
+ "directory parent is also destination"))
+
rebase = extensions.find('rebase')
# dummy state to trick rebase node
- assert orig.p2().rev() == node.nullrev, 'no support yet'
+ if not orig.p2().rev() == node.nullrev:
+ raise util.Abort(
+ 'no support for evolving merge changesets yet',
+ hint="Redo the merge a use `hg prune` to obsolete the old one")
destbookmarks = repo.nodebookmarks(dest.node())
- cmdutil.duplicatecopies(repo, orig.node(), dest.node())
nodesrc = orig.node()
destphase = repo[nodesrc].phase()
- if rebase.rebasenode.func_code.co_argcount == 5:
- # rebasenode collapse argument was introduced by
- # d1afbf03e69a (2.3)
- rebase.rebasenode(repo, orig.node(), dest.node(),
- {node.nullrev: node.nullrev}, False)
- else:
- rebase.rebasenode(repo, orig.node(), dest.node(),
- {node.nullrev: node.nullrev})
+ wlock = lock = None
try:
+ wlock = repo.wlock()
+ lock = repo.lock()
+ r = rebase.rebasenode(repo, orig.node(), dest.node(),
+ {node.nullrev: node.nullrev}, False)
+ if r[-1]: #some conflict
+ raise util.Abort(
+ 'unresolved merge conflicts (see hg help resolve)')
+ cmdutil.duplicatecopies(repo, orig.node(), dest.node())
nodenew = rebase.concludenode(repo, orig.node(), dest.node(),
node.nullid)
- except util.Abort:
- repo.ui.write_err(_('/!\\ stabilize failed /!\\\n'))
- repo.ui.write_err(_('/!\\ Their is no "hg stabilize --continue" /!\\\n'))
- repo.ui.write_err(_('/!\\ use "hg up -C . ; hg stabilize --dry-run" /!\\\n'))
+ except util.Abort, exc:
+ class LocalMergeFailure(MergeFailure, exc.__class__):
+ pass
+ exc.__class__ = LocalMergeFailure
raise
+ finally:
+ lockmod.release(lock, wlock)
oldbookmarks = repo.nodebookmarks(nodesrc)
if nodenew is not None:
phases.retractboundary(repo, destphase, [nodenew])
- repo.addobsolete(nodenew, nodesrc)
+ createmarkers(repo, [(repo[nodesrc], (repo[nodenew],))])
for book in oldbookmarks:
repo._bookmarks[book] = nodenew
else:
- repo.addobsolete(node.nullid, nodesrc)
+ createmarkers(repo, [(repo[nodesrc], ())])
# Behave like rebase, move bookmarks to dest
for book in oldbookmarks:
repo._bookmarks[book] = dest.node()
for book in destbookmarks: # restore bookmark that rebase move
repo._bookmarks[book] = dest.node()
if oldbookmarks or destbookmarks:
- bookmarks.write(repo)
+ repo._bookmarks.write()
+ return nodenew
except util.Abort:
# Invalidate the previous setparents
repo.dirstate.invalidate()
raise
-def stabilizableunstable(repo, pctx):
- """Return a changectx for an unstable changeset which can be
- stabilized on top of pctx or one of its descendants. None if none
- can be found.
- """
- def selfanddescendants(repo, pctx):
- yield pctx
- for ctx in pctx.descendants():
- yield ctx
-
- # Look for an unstable which can be stabilized as a child of
- # node. The unstable must be a child of one of node predecessors.
- for ctx in selfanddescendants(repo, pctx):
- unstables = list(repo.set('unstable() and children(obsancestors(%d))',
- ctx.rev()))
- if unstables:
- return unstables[0]
- return None
-
def _bookmarksupdater(repo, oldid):
"""Return a callable update(newid) updating the current bookmark
and bookmarks bound to oldid to newid.
@@ -211,89 +879,710 @@
repo._bookmarks[b] = newid
dirty = True
if dirty:
- bookmarks.write(repo)
+ repo._bookmarks.write()
return updatebookmarks
### new command
#############################
cmdtable = {}
command = cmdutil.command(cmdtable)
+metadataopts = [
+ ('d', 'date', '',
+ _('record the specified date in metadata'), _('DATE')),
+ ('u', 'user', '',
+ _('record the specified user in metadata'), _('USER')),
+]
-@command('^stabilize|evolve|solve',
- [('n', 'dry-run', False, 'do not perform actions, print what to be done'),
- ('A', 'any', False, 'stabilize any unstable changeset'),],
- _('[OPTIONS]...'))
-def stabilize(ui, repo, **opts):
- """rebase an unstable changeset to make it stable again
+@eh.uisetup
+def _installimportobsolete(ui):
+ entry = cmdutil.findcmd('import', commands.table)[1]
+ entry[1].append(('', 'obsolete', False,
+ _('mark the old node as obsoleted by'
+ 'the created commit')))
+
+@eh.wrapfunction(mercurial.cmdutil, 'tryimportone')
+def tryimportone(orig, ui, repo, hunk, parents, opts, *args, **kwargs):
+ extracted = patch.extract(ui, hunk)
+ expected = extracted[5]
+ oldextract = patch.extract
+ try:
+ patch.extract = lambda ui, hunk: extracted
+ ret = orig(ui, repo, hunk, parents, opts, *args, **kwargs)
+ finally:
+ patch.extract = oldextract
+ created = ret[1]
+ if opts['obsolete'] and created is not None and created != expected:
+ tr = repo.transaction('import-obs')
+ try:
+ metadata = {'user': ui.username()}
+ repo.obsstore.create(tr, node.bin(expected), (created,),
+ metadata=metadata)
+ tr.close()
+ finally:
+ tr.release()
+ return ret
+
+
+def _deprecatealias(oldalias, newalias):
+ '''Deprecates an alias for a command in favour of another
+
+ Creates a new entry in the command table for the old alias. It creates a
+ wrapper that has its synopsis set to show that is has been deprecated.
+ The documentation will be replace with a pointer to the new alias.
+ If a user invokes the command a deprecation warning will be printed and
+ the command of the *new* alias will be invoked.
+
+ This function is loosely based on the extensions.wrapcommand function.
+ '''
+ aliases, entry = cmdutil.findcmd(newalias, cmdtable)
+ for alias, e in cmdtable.iteritems():
+ if e is entry:
+ break
+
+ synopsis = '(DEPRECATED)'
+ if len(entry) > 2:
+ fn, opts, _syn = entry
+ else:
+ fn, opts, = entry
+ deprecationwarning = _('%s have been deprecated in favor of %s\n' % (
+ oldalias, newalias))
+ def newfn(*args, **kwargs):
+ ui = args[0]
+ ui.warn(deprecationwarning)
+ util.checksignature(fn)(*args, **kwargs)
+ newfn.__doc__ = deprecationwarning
+ cmdwrapper = command(oldalias, opts, synopsis)
+ cmdwrapper(newfn)
+
+@eh.extsetup
+def deprecatealiases(ui):
+ _deprecatealias('gup', 'next')
+ _deprecatealias('gdown', 'previous')
+
+@command('debugrecordpruneparents', [], '')
+def cmddebugrecordpruneparents(ui, repo):
+ """add parents data to prune markers when possible
+
+ This commands search the repo for prune markers without parent information.
+ If the pruned node is locally known, a new markers with parent data is
+ created."""
+ pgop = 'reading markers'
+
+ # lock from the beginning to prevent race
+ wlock = lock = tr = None
+ try:
+ wlock = repo.wlock()
+ lock = repo.lock()
+ tr = repo.transaction('recordpruneparents')
+ unfi = repo.unfiltered()
+ nm = unfi.changelog.nodemap
+ store = repo.obsstore
+ pgtotal = len(store._all)
+ for idx, mark in enumerate(list(store._all)):
+ if not mark[1]:
+ rev = nm.get(mark[0])
+ if rev is not None:
+ ctx = unfi[rev]
+ meta = obsolete.decodemeta(mark[3])
+ for i, p in enumerate(ctx.parents(), 1):
+ meta['p%i' % i] = p.hex()
+ before = len(store._all)
+ store.create(tr, mark[0], mark[1], mark[2], meta)
+ if len(store._all) - before:
+ ui.write('created new markers for %i\n' % rev)
+ ui.progress(pgop, idx, total=pgtotal)
+ tr.close()
+ ui.progress(pgop, None)
+ finally:
+ if tr is not None:
+ tr.release()
+ lockmod.release(lock, wlock)
- By default, take the first unstable changeset which could be
- rebased as child of the working directory parent revision or one
- of its descendants and rebase it.
+@command('debugobsstorestat', [], '')
+def cmddebugobsstorestat(ui, repo):
+ """print statistic about obsolescence markers in the repo"""
+ store = repo.obsstore
+ unfi = repo.unfiltered()
+ nm = unfi.changelog.nodemap
+ ui.write('markers total: %9i\n' % len(store._all))
+ sucscount = [0, 0 , 0, 0]
+ known = 0
+ parentsdata = 0
+ metatotallenght = 0
+ metakeys = {}
+ # node -> cluster mapping
+ # a cluster is a (set(nodes), set(markers)) tuple
+ clustersmap = {}
+ # same data using parent information
+ pclustersmap= {}
+ for mark in store:
+ if mark[0] in nm:
+ known += 1
+ nbsucs = len(mark[1])
+ sucscount[min(nbsucs, 3)] += 1
+ metatotallenght += len(mark[3])
+ meta = obsolete.decodemeta(mark[3])
+ for key in meta:
+ metakeys.setdefault(key, 0)
+ metakeys[key] += 1
+ parents = [meta.get('p1'), meta.get('p2')]
+ parents = [node.bin(p) for p in parents if p is not None]
+ if parents:
+ parentsdata += 1
+ # cluster handling
+ nodes = set()
+ nodes.add(mark[0])
+ nodes.update(mark[1])
+ c = (set(nodes), set([mark]))
+
+ toproceed = set(nodes)
+ while toproceed:
+ n = toproceed.pop()
+ other = clustersmap.get(n)
+ if (other is not None
+ and other is not c):
+ other[0].update(c[0])
+ other[1].update(c[1])
+ for on in c[0]:
+ if on in toproceed:
+ continue
+ clustersmap[on] = other
+ c = other
+ clustersmap[n] = c
+ # same with parent data
+ nodes.update(parents)
+ c = (set(nodes), set([mark]))
+ toproceed = set(nodes)
+ while toproceed:
+ n = toproceed.pop()
+ other = pclustersmap.get(n)
+ if (other is not None
+ and other is not c):
+ other[0].update(c[0])
+ other[1].update(c[1])
+ for on in c[0]:
+ if on in toproceed:
+ continue
+ pclustersmap[on] = other
+ c = other
+ pclustersmap[n] = c
- With --any, stabilize any unstable changeset.
+ # freezing the result
+ for c in clustersmap.values():
+ fc = (frozenset(c[0]), frozenset(c[1]))
+ for n in fc[0]:
+ clustersmap[n] = fc
+ # same with parent data
+ for c in pclustersmap.values():
+ fc = (frozenset(c[0]), frozenset(c[1]))
+ for n in fc[0]:
+ pclustersmap[n] = fc
+ ui.write(' for known precursors: %9i\n' % known)
+ ui.write(' with parents data: %9i\n' % parentsdata)
+ # successors data
+ ui.write('markers with no successors: %9i\n' % sucscount[0])
+ ui.write(' 1 successors: %9i\n' % sucscount[1])
+ ui.write(' 2 successors: %9i\n' % sucscount[2])
+ ui.write(' more than 2 successors: %9i\n' % sucscount[3])
+ # meta data info
+ ui.write('average meta length: %9i\n'
+ % (metatotallenght/len(store._all)))
+ ui.write(' available keys:\n')
+ for key in sorted(metakeys):
+ ui.write(' %15s: %9i\n' % (key, metakeys[key]))
+
+ allclusters = list(set(clustersmap.values()))
+ allclusters.sort(key=lambda x: len(x[1]))
+ ui.write('disconnected clusters: %9i\n' % len(allclusters))
- The working directory is updated to the rebased revision.
+ ui.write(' any known node: %9i\n'
+ % len([c for c in allclusters
+ if [n for n in c[0] if nm.get(n) is not None]]))
+ if allclusters:
+ nbcluster = len(allclusters)
+ ui.write(' smallest length: %9i\n' % len(allclusters[0][1]))
+ ui.write(' longer length: %9i\n' % len(allclusters[-1][1]))
+ median = len(allclusters[nbcluster//2][1])
+ ui.write(' median length: %9i\n' % median)
+ mean = sum(len(x[1]) for x in allclusters) // nbcluster
+ ui.write(' mean length: %9i\n' % mean)
+ allpclusters = list(set(pclustersmap.values()))
+ allpclusters.sort(key=lambda x: len(x[1]))
+ ui.write(' using parents data: %9i\n' % len(allpclusters))
+ ui.write(' any known node: %9i\n'
+ % len([c for c in allclusters
+ if [n for n in c[0] if nm.get(n) is not None]]))
+ if allpclusters:
+ nbcluster = len(allpclusters)
+ ui.write(' smallest length: %9i\n' % len(allpclusters[0][1]))
+ ui.write(' longer length: %9i\n' % len(allpclusters[-1][1]))
+ median = len(allpclusters[nbcluster//2][1])
+ ui.write(' median length: %9i\n' % median)
+ mean = sum(len(x[1]) for x in allpclusters) // nbcluster
+ ui.write(' mean length: %9i\n' % mean)
+
+@command('^evolve|stabilize|solve',
+ [('n', 'dry-run', False,
+ 'do not perform actions, just print what would be done'),
+ ('A', 'any', False, 'evolve any troubled changeset'),
+ ('a', 'all', False, 'evolve all troubled changesets'),
+ ('c', 'continue', False, 'continue an interrupted evolution'), ],
+ _('[OPTIONS]...'))
+def evolve(ui, repo, **opts):
+ """Solve trouble in your repository
+
+ - rebase unstable changesets to make them stable again,
+ - create proper diffs from bumped changesets,
+ - merge divergent changesets,
+ - update to a successor if the working directory parent is
+ obsolete
+
+ By default, takes the first troubled changeset that looks relevant.
+
+ (The logic is still a bit fuzzy)
+
+ - For unstable, this means taking the first which could be rebased as a
+ child of the working directory parent revision or one of its descendants
+ and rebasing it.
+
+ - For divergent, this means taking "." if applicable.
+
+ With --any, evolve picks any troubled changeset to repair.
+
+ The working directory is updated to the newly created revision.
"""
- obsolete = extensions.find('obsolete')
+ contopt = opts['continue']
+ anyopt = opts['any']
+ allopt = opts['all']
+ dryrunopt = opts['dry_run']
+
+ if contopt:
+ if anyopt:
+ raise util.Abort('cannot specify both "--any" and "--continue"')
+ if allopt:
+ raise util.Abort('cannot specify both "--all" and "--continue"')
+ graftcmd = commands.table['graft'][0]
+ return graftcmd(ui, repo, old_obsolete=True, **{'continue': True})
+
+ tr = _picknexttroubled(ui, repo, anyopt or allopt)
+ if tr is None:
+ if repo['.'].obsolete():
+ displayer = cmdutil.show_changeset(
+ ui, repo, {'template': shorttemplate})
+ successors = set()
+
+ for successorsset in obsolete.successorssets(repo, repo['.'].node()):
+ for nodeid in successorsset:
+ successors.add(repo[nodeid])
+
+ if not successors:
+ ui.warn(_('parent is obsolete without successors; ' +
+ 'likely killed\n'))
+ return 2
- node = None
- if not opts['any']:
- node = stabilizableunstable(repo, repo['.'])
- if node is None:
- unstables = list(repo.set('unstable()'))
- if unstables and not opts['any']:
- ui.write_err(_('nothing to stabilize here\n'))
- ui.status(_('(%i unstable changesets, do you want --any ?)\n')
- % len(unstables))
+ elif len(successors) > 1:
+ ui.warn(_('parent is obsolete with multiple successors:\n'))
+
+ for ctx in sorted(successors, key=lambda ctx: ctx.rev()):
+ displayer.show(ctx)
+
+ return 2
+
+ else:
+ ctx = successors.pop()
+
+ ui.status(_('update:'))
+ if not ui.quiet:
+ displayer.show(ctx)
+
+ if dryrunopt:
+ print 'hg update %s' % ctx.rev()
+ return 0
+ else:
+ return hg.update(repo, ctx.rev())
+
+ troubled = repo.revs('troubled()')
+ if troubled:
+ ui.write_err(_('nothing to evolve here\n'))
+ ui.status(_('(%i troubled changesets, do you want --any ?)\n')
+ % len(troubled))
return 2
- elif not unstables:
- ui.write_err(_('no unstable changeset\n'))
+ else:
+ ui.write_err(_('no troubled changesets\n'))
return 1
- node = unstables[0]
+
+ def progresscb():
+ if allopt:
+ ui.progress('evolve', seen, unit='changesets', total=count)
+ seen = 1
+ count = allopt and _counttroubled(ui, repo) or 1
+
+ while tr is not None:
+ progresscb()
+ result = _evolveany(ui, repo, tr, dryrunopt, progresscb=progresscb)
+ progresscb()
+ seen += 1
+ if not allopt:
+ return result
+ progresscb()
+ tr = _picknexttroubled(ui, repo, anyopt or allopt)
+
+ if allopt:
+ ui.progress('evolve', None)
+
+
+def _evolveany(ui, repo, tr, dryrunopt, progresscb):
+ repo = repo.unfiltered()
+ tr = repo[tr.rev()]
+ cmdutil.bailifchanged(repo)
+ troubles = tr.troubles()
+ if 'unstable' in troubles:
+ return _solveunstable(ui, repo, tr, dryrunopt, progresscb)
+ elif 'bumped' in troubles:
+ return _solvebumped(ui, repo, tr, dryrunopt, progresscb)
+ elif 'divergent' in troubles:
+ repo = repo.unfiltered()
+ tr = repo[tr.rev()]
+ return _solvedivergent(ui, repo, tr, dryrunopt, progresscb)
+ else:
+ assert False # WHAT? unknown troubles
+
+def _counttroubled(ui, repo):
+ """Count the amount of troubled changesets"""
+ troubled = set()
+ troubled.update(getrevs(repo, 'unstable'))
+ troubled.update(getrevs(repo, 'bumped'))
+ troubled.update(getrevs(repo, 'divergent'))
+ return len(troubled)
- obs = node.parents()[0]
+def _picknexttroubled(ui, repo, pickany=False, progresscb=None):
+ """Pick a the next trouble changeset to solve"""
+ if progresscb: progresscb()
+ tr = _stabilizableunstable(repo, repo['.'])
+ if tr is None:
+ wdp = repo['.']
+ if 'divergent' in wdp.troubles():
+ tr = wdp
+ if tr is None and pickany:
+ troubled = list(repo.set('unstable()'))
+ if not troubled:
+ troubled = list(repo.set('bumped()'))
+ if not troubled:
+ troubled = list(repo.set('divergent()'))
+ if troubled:
+ tr = troubled[0]
+
+ return tr
+
+def _stabilizableunstable(repo, pctx):
+ """Return a changectx for an unstable changeset which can be
+ stabilized on top of pctx or one of its descendants. None if none
+ can be found.
+ """
+ def selfanddescendants(repo, pctx):
+ yield pctx
+ for prec in repo.set('allprecursors(%d)', pctx):
+ yield prec
+ for ctx in pctx.descendants():
+ yield ctx
+ for prec in repo.set('allprecursors(%d)', ctx):
+ yield prec
+
+ # Look for an unstable which can be stabilized as a child of
+ # node. The unstable must be a child of one of node predecessors.
+ for ctx in selfanddescendants(repo, pctx):
+ for child in ctx.children():
+ if child.unstable():
+ return child
+ return None
+
+def _solveunstable(ui, repo, orig, dryrun=False, progresscb=None):
+ """Stabilize a unstable changeset"""
+ obs = orig.parents()[0]
if not obs.obsolete():
- obs = node.parents()[1]
+ print obs.rev(), orig.parents()
+ print orig.rev()
+ obs = orig.parents()[1]
assert obs.obsolete()
- newer = obsolete.newerversion(repo, obs.node())
+ newer = obsolete.successorssets(repo, obs.node())
+ # search of a parent which is not killed
+ while not newer or newer == [()]:
+ ui.debug("stabilize target %s is plain dead,"
+ " trying to stabilize on its parent")
+ obs = obs.parents()[0]
+ newer = obsolete.successorssets(repo, obs.node())
if len(newer) > 1:
- ui.write_err(_("conflict rewriting. can't choose destination\n"))
- return 2
+ raise util.Abort(_("conflict rewriting. can't choose destination\n"))
targets = newer[0]
- if not targets:
- ui.write_err(_("does not handle kill parent yet\n"))
- return 2
+ assert targets
if len(targets) > 1:
- ui.write_err(_("does not handle splitted parent yet\n"))
+ raise util.Abort(_("does not handle split parents yet\n"))
return 2
target = targets[0]
displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
target = repo[target]
repo.ui.status(_('move:'))
if not ui.quiet:
- displayer.show(node)
+ displayer.show(orig)
repo.ui.status(_('atop:'))
if not ui.quiet:
displayer.show(target)
- todo= 'hg rebase -Dr %s -d %s\n' % (node, target)
- if opts['dry_run']:
+ if progresscb: progresscb()
+ todo = 'hg rebase -r %s -d %s\n' % (orig, target)
+ if dryrun:
repo.ui.write(todo)
else:
repo.ui.note(todo)
+ if progresscb: progresscb()
lock = repo.lock()
try:
- relocate(repo, node, target)
+ relocate(repo, orig, target)
+ except MergeFailure:
+ repo.opener.write('graftstate', orig.hex() + '\n')
+ repo.ui.write_err(_('evolve failed!\n'))
+ repo.ui.write_err(
+ _('fix conflict and run "hg evolve --continue"\n'))
+ raise
finally:
lock.release()
+def _solvebumped(ui, repo, bumped, dryrun=False, progresscb=None):
+ """Stabilize a bumped changeset"""
+ # For now we deny bumped merge
+ if len(bumped.parents()) > 1:
+ raise util.Abort('late comer stabilization is confused by bumped'
+ ' %s being a merge' % bumped)
+ prec = repo.set('last(allprecursors(%d) and public())', bumped).next()
+ # For now we deny target merge
+ if len(prec.parents()) > 1:
+ raise util.Abort('late comer evolution is confused by precursors'
+ ' %s being a merge' % prec)
+
+ displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
+ repo.ui.status(_('recreate:'))
+ if not ui.quiet:
+ displayer.show(bumped)
+ repo.ui.status(_('atop:'))
+ if not ui.quiet:
+ displayer.show(prec)
+ if dryrun:
+ todo = 'hg rebase --rev %s --dest %s;\n' % (bumped, prec.p1())
+ repo.ui.write(todo)
+ repo.ui.write('hg update %s;\n' % prec)
+ repo.ui.write('hg revert --all --rev %s;\n' % bumped)
+ repo.ui.write('hg commit --msg "bumped update to %s"')
+ return 0
+ if progresscb: progresscb()
+ wlock = repo.wlock()
+ try:
+ newid = tmpctx = None
+ tmpctx = bumped
+ lock = repo.lock()
+ try:
+ bmupdate = _bookmarksupdater(repo, bumped.node())
+ # Basic check for common parent. Far too complicated and fragile
+ tr = repo.transaction('bumped-stabilize')
+ try:
+ if not list(repo.set('parents(%d) and parents(%d)', bumped, prec)):
+ # Need to rebase the changeset at the right place
+ repo.ui.status(
+ _('rebasing to destination parent: %s\n') % prec.p1())
+ try:
+ tmpid = relocate(repo, bumped, prec.p1())
+ if tmpid is not None:
+ tmpctx = repo[tmpid]
+ createmarkers(repo, [(bumped, (tmpctx,))])
+ except MergeFailure:
+ repo.opener.write('graftstate', bumped.hex() + '\n')
+ repo.ui.write_err(_('evolution failed!\n'))
+ repo.ui.write_err(
+ _('fix conflict and run "hg evolve --continue"\n'))
+ raise
+ # Create the new commit context
+ repo.ui.status(_('computing new diff\n'))
+ files = set()
+ copied = copies.pathcopies(prec, bumped)
+ precmanifest = prec.manifest()
+ for key, val in bumped.manifest().iteritems():
+ if precmanifest.pop(key, None) != val:
+ files.add(key)
+ files.update(precmanifest) # add missing files
+ # commit it
+ if files: # something to commit!
+ def filectxfn(repo, ctx, path):
+ if path in bumped:
+ fctx = bumped[path]
+ flags = fctx.flags()
+ mctx = memfilectx(repo, fctx.path(), fctx.data(),
+ islink='l' in flags,
+ isexec='x' in flags,
+ copied=copied.get(path))
+ return mctx
+ raise IOError()
+ text = 'bumped update to %s:\n\n' % prec
+ text += bumped.description()
+
+ new = context.memctx(repo,
+ parents=[prec.node(), node.nullid],
+ text=text,
+ files=files,
+ filectxfn=filectxfn,
+ user=bumped.user(),
+ date=bumped.date(),
+ extra=bumped.extra())
+
+ newid = repo.commitctx(new)
+ if newid is None:
+ createmarkers(repo, [(tmpctx, ())])
+ newid = prec.node()
+ else:
+ phases.retractboundary(repo, bumped.phase(), [newid])
+ createmarkers(repo, [(tmpctx, (repo[newid],))],
+ flag=obsolete.bumpedfix)
+ bmupdate(newid)
+ tr.close()
+ repo.ui.status(_('committed as %s\n') % node.short(newid))
+ finally:
+ tr.release()
+ finally:
+ lock.release()
+ # reroute the working copy parent to the new changeset
+ repo.dirstate.setparents(newid, node.nullid)
+ finally:
+ wlock.release()
+
+def _solvedivergent(ui, repo, divergent, dryrun=False, progresscb=None):
+ base, others = divergentdata(divergent)
+ if len(others) > 1:
+ othersstr = "[%s]" % (','.join([str(i) for i in others]))
+ hint = ("changeset %d is divergent with a changeset that got splitted "
+ "| into multiple ones:\n[%s]\n"
+ "| This is not handled by automatic evolution yet\n"
+ "| You have to fallback to manual handling with commands "
+ "such as:\n"
+ "| - hg touch -D\n"
+ "| - hg prune\n"
+ "| \n"
+ "| You should contact your local evolution Guru for help.\n"
+ % (divergent, othersstr))
+ raise util.Abort("we do not handle divergence with split yet",
+ hint='')
+ other = others[0]
+ if divergent.phase() <= phases.public:
+ raise util.Abort("we can't resolve this conflict from the public side",
+ hint="%s is public, try from %s" % (divergent, other))
+ if len(other.parents()) > 1:
+ raise util.Abort("divergent changeset can't be a merge (yet)",
+ hint="You have to fallback to solving this by hand...\n"
+ "| This probably means redoing the merge and using "
+ "| `hg prune` to kill older version.")
+ if other.p1() not in divergent.parents():
+ raise util.Abort("parents are not common (not handled yet)",
+ hint="| %(d)s, %(o)s are not based on the same changeset."
+ "| With the current state of its implementation, "
+ "| evolve does not work in that case.\n"
+ "| rebase one of them next to the other and run "
+ "| this command again.\n"
+ "| - either: hg rebase -dest 'p1(%(d)s)' -r %(o)s"
+ "| - or: hg rebase -dest 'p1(%(d)s)' -r %(o)s"
+ % {'d': divergent, 'o': other})
+
+ displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
+ ui.status(_('merge:'))
+ if not ui.quiet:
+ displayer.show(divergent)
+ ui.status(_('with: '))
+ if not ui.quiet:
+ displayer.show(other)
+ ui.status(_('base: '))
+ if not ui.quiet:
+ displayer.show(base)
+ if dryrun:
+ ui.write('hg update -c %s &&\n' % divergent)
+ ui.write('hg merge %s &&\n' % other)
+ ui.write('hg commit -m "auto merge resolving conflict between '
+ '%s and %s"&&\n' % (divergent, other))
+ ui.write('hg up -C %s &&\n' % base)
+ ui.write('hg revert --all --rev tip &&\n')
+ ui.write('hg commit -m "`hg log -r %s --template={desc}`";\n'
+ % divergent)
+ return
+ wlock = lock = None
+ try:
+ wlock = repo.wlock()
+ lock = repo.lock()
+ if divergent not in repo[None].parents():
+ repo.ui.status(_('updating to "local" conflict\n'))
+ hg.update(repo, divergent.rev())
+ repo.ui.note(_('merging divergent changeset\n'))
+ if progresscb: progresscb()
+ stats = merge.update(repo,
+ other.node(),
+ branchmerge=True,
+ force=False,
+ partial=None,
+ ancestor=base.node(),
+ mergeancestor=True)
+ hg._showstats(repo, stats)
+ if stats[3]:
+ repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
+ "or 'hg update -C .' to abandon\n"))
+ if stats[3] > 0:
+ raise util.Abort('merge conflict between several amendments '
+ '(this is not automated yet)',
+ hint="""/!\ You can try:
+/!\ * manual merge + resolve => new cset X
+/!\ * hg up to the parent of the amended changeset (which are named W and Z)
+/!\ * hg revert --all -r X
+/!\ * hg ci -m "same message as the amended changeset" => new cset Y
+/!\ * hg kill -n Y W Z
+""")
+ if progresscb: progresscb()
+ tr = repo.transaction('stabilize-divergent')
+ try:
+ repo.dirstate.setparents(divergent.node(), node.nullid)
+ oldlen = len(repo)
+ amend(ui, repo, message='', logfile='')
+ if oldlen == len(repo):
+ new = divergent
+ # no changes
+ else:
+ new = repo['.']
+ createmarkers(repo, [(other, (new,))])
+ phases.retractboundary(repo, other.phase(), [new.node()])
+ tr.close()
+ finally:
+ tr.release()
+ finally:
+ lockmod.release(lock, wlock)
+
+
+def divergentdata(ctx):
+ """return base, other part of a conflict
+
+ This only return the first one.
+
+ XXX this woobly function won't survive XXX
+ """
+ for base in ctx._repo.set('reverse(precursors(%d))', ctx):
+ newer = obsolete.successorssets(ctx._repo, base.node())
+ # drop filter and solution including the original ctx
+ newer = [n for n in newer if n and ctx.node() not in n]
+ if newer:
+ return base, tuple(ctx._repo[o] for o in newer[0])
+ raise util.Abort('base of divergent changeset not found',
+ hint='this case is not yet handled')
+
+
+
shorttemplate = '[{rev}] {desc|firstline}\n'
-@command('^gdown',
+@command('^previous',
[],
'')
-def cmdgdown(ui, repo):
- """update to parent an display summary lines"""
+def cmdprevious(ui, repo):
+ """update to parent and display summary lines"""
wkctx = repo[None]
wparents = wkctx.parents()
if len(wparents) != 1:
@@ -303,7 +1592,12 @@
displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
if len(parents) == 1:
p = parents[0]
- hg.update(repo, p.rev())
+ bm = bookmarks.readcurrent(repo)
+ shouldmove = bm is not None and bookmarks.iscurrent(repo, bm)
+ ret = hg.update(repo, p.rev())
+ if not ret and shouldmove:
+ repo._bookmarks[bm] = p.node()
+ repo._bookmarks.write()
displayer.show(p)
return 0
else:
@@ -312,11 +1606,11 @@
ui.warn(_('multiple parents, explicitly update to one\n'))
return 1
-@command('^gup',
+@command('^next',
[],
'')
-def cmdup(ui, repo):
- """update to child an display summary lines"""
+def cmdnext(ui, repo):
+ """update to child and display summary lines"""
wkctx = repo[None]
wparents = wkctx.parents()
if len(wparents) != 1:
@@ -325,62 +1619,183 @@
children = [ctx for ctx in wparents[0].children() if not ctx.obsolete()]
displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})
if not children:
- ui.warn(_('No non-obsolete children\n'))
+ ui.warn(_('no non-obsolete children\n'))
return 1
if len(children) == 1:
c = children[0]
- hg.update(repo, c.rev())
+ bm = bookmarks.readcurrent(repo)
+ shouldmove = bm is not None and bookmarks.iscurrent(repo, bm)
+ ret = hg.update(repo, c.rev())
+ if not ret and shouldmove:
+ repo._bookmarks[bm] = c.node()
+ repo._bookmarks.write()
displayer.show(c)
return 0
else:
for c in children:
displayer.show(c)
- ui.warn(_('Multiple non-obsolete children, explicitly update to one\n'))
+ ui.warn(_('multiple non-obsolete children, '
+ 'explicitly update to one of them\n'))
return 1
+def _reachablefrombookmark(repo, revs, mark):
+ """filter revisions and bookmarks reachable from the given bookmark
+ yoinked from mq.py
+ """
+ marks = repo._bookmarks
+ if mark not in marks:
+ raise util.Abort(_("bookmark '%s' not found") % mark)
+
+ # If the requested bookmark is not the only one pointing to a
+ # a revision we have to only delete the bookmark and not strip
+ # anything. revsets cannot detect that case.
+ uniquebm = True
+ for m, n in marks.iteritems():
+ if m != mark and n == repo[mark].node():
+ uniquebm = False
+ break
+ if uniquebm:
+ rsrevs = repo.revs("ancestors(bookmark(%s)) - "
+ "ancestors(head() and not bookmark(%s)) - "
+ "ancestors(bookmark() and not bookmark(%s)) - "
+ "obsolete()",
+ mark, mark, mark)
+ revs.update(set(rsrevs))
+ return marks,revs
+
+def _deletebookmark(ui, marks, mark):
+ del marks[mark]
+ marks.write()
+ ui.write(_("bookmark '%s' deleted\n") % mark)
+
+
+
+def _getmetadata(**opts):
+ metadata = {}
+ date = opts.get('date')
+ user = opts.get('user')
+ if date:
+ metadata['date'] = '%i %i' % util.parsedate(date)
+ if user:
+ metadata['user'] = user
+ return metadata
+
+
@command('^prune|obsolete|kill',
- [('n', 'new', [], _("successor changeset"))],
- _('[OPTION] REV...'))
-def kill(ui, repo, *revs, **opts):
- """mark a changeset as obsolete
+ [('n', 'new', [], _("successor changeset (DEPRECATED)")),
+ ('s', 'succ', [], _("successor changeset")),
+ ('r', 'rev', [], _("revisions to prune")),
+ ('', 'biject', False, _("do a 1-1 map between rev and successor ranges")),
+ ('B', 'bookmark', '', _("remove revs only reachable from given"
+ " bookmark"))] + metadataopts,
+ _('[OPTION] [-r] REV...'))
+ # -U --noupdate option to prevent wc update and or bookmarks update ?
+def cmdprune(ui, repo, *revs, **opts):
+ """hide changesets by marking them obsolete
+
+ Obsolete changesets becomes invisible to all commands.
+
+ Unpruned descendants of pruned changesets becomes "unstable". Use the
+ :hg:`evolve` to handle such situation.
+
+ When the working directory parent is pruned, the repository is updated to a
+ non-obsolete parent.
+
+ You can use the ``--succ`` option to inform mercurial that a newer version
+ of the pruned changeset exists.
- This update the parent directory to a not-killed parent if the current
- working directory parent are killed.
+ You can use the ``--biject`` option to specify a 1-1 (bijection) between
+ revisions to prune and successor changesets. This option may be removed in
+ a future release (with the functionality absorbed automatically).
+
+ """
+ revs = set(scmutil.revrange(repo, list(revs) + opts.get('rev')))
+ succs = opts['new'] + opts['succ']
+ bookmark = opts.get('bookmark')
+ metadata = _getmetadata(**opts)
+ biject = opts.get('biject')
- XXX bookmark support
- XXX handle merge
- XXX check immutable first
- """
+ if bookmark:
+ marks,revs = _reachablefrombookmark(repo, revs, bookmark)
+ if not revs:
+ # no revisions to prune - delete bookmark immediately
+ _deletebookmark(ui, marks, bookmark)
+
+ if not revs:
+ raise util.Abort(_('nothing to prune'))
+
+ wlock = lock = None
wlock = repo.wlock()
+ sortedrevs = lambda specs: sorted(set(scmutil.revrange(repo, specs)))
try:
- new = set(noderange(repo, opts['new']))
- targetnodes = set(noderange(repo, revs))
- if not new:
- new = [node.nullid]
- for n in targetnodes:
- if not repo[n].mutable():
- ui.warn(_("cannot kill immutable changeset %s\n") % repo[n])
- else:
- for ne in new:
- repo.addobsolete(ne, n)
- # update to an unkilled parent
+ lock = repo.lock()
+ # defines pruned changesets
+ precs = []
+ for p in sortedrevs(revs):
+ cp = repo[p]
+ if not cp.mutable():
+ # note: createmarkers() would have raised something anyway
+ raise util.Abort('cannot prune immutable changeset: %s' % cp,
+ hint='see "hg help phases" for details')
+ precs.append(cp)
+ if not precs:
+ raise util.Abort('nothing to prune')
+
+ # defines successors changesets
+ sucs = tuple(repo[n] for n in sortedrevs(succs))
+ if not biject and len(sucs) > 1 and len(precs) > 1:
+ msg = "Can't use multiple successors for multiple precursors"
+ raise util.Abort(msg)
+
+ if biject and len(sucs) != len(precs):
+ msg = "Can't use %d successors for %d precursors" \
+ % (len(sucs), len(precs))
+ raise util.Abort(msg)
+
+ relations = [(p, sucs) for p in precs]
+ if biject:
+ relations = [(p, (s,)) for p, s in zip(precs, sucs)]
+
+ # create markers
+ createmarkers(repo, relations, metadata=metadata)
+
+ # informs that changeset have been pruned
+ ui.status(_('%i changesets pruned\n') % len(precs))
+
wdp = repo['.']
- newnode = wdp
- while newnode.obsolete():
- newnode = newnode.parents()[0]
+
+ if len(sucs) == 1 and len(precs) == 1 and wdp in precs:
+ # '.' killed, so update to the successor
+ newnode = sucs[0]
+ else:
+ # update to an unkilled parent
+ newnode = wdp
+
+ while newnode.obsolete():
+ newnode = newnode.parents()[0]
+
if newnode.node() != wdp.node():
commands.update(ui, repo, newnode.rev())
ui.status(_('working directory now at %s\n') % newnode)
-
+ # update bookmarks
+ if bookmark:
+ _deletebookmark(ui, marks, bookmark)
+ for ctx in repo.unfiltered().set('bookmark() and %ld', precs):
+ ldest = list(repo.set('max((::%d) - obsolete())', ctx))
+ if ldest:
+ dest = ldest[0]
+ updatebookmarks = _bookmarksupdater(repo, ctx.node())
+ updatebookmarks(dest.node())
finally:
- wlock.release()
+ lockmod.release(lock, wlock)
-@command('^amend|refresh',
+@command('amend|refresh',
[('A', 'addremove', None,
_('mark new/missing files as added/removed before committing')),
- ('n', 'note', '', _('use text as commit message for this update')),
- ('c', 'change', '', _('specifies the changesets to amend'), _('REV')),
('e', 'edit', False, _('invoke editor on commit messages')),
+ ('', 'close-branch', None,
+ _('mark a branch as closed, hiding it from the branch list')),
+ ('s', 'secret', None, _('use the secret phase for committing')),
] + walkopts + commitopts + commitopts2,
_('[OPTION]... [FILE]...'))
def amend(ui, repo, *pats, **opts):
@@ -393,10 +1808,6 @@
If you don't specify -m, the parent's message will be reused.
- If you specify --change, amend additionally considers all
- changesets between the indicated changeset and the working copy
- parent as updates to be subsumed.
-
Behind the scenes, Mercurial first commits the update as a regular child
of the current parent. Then it creates a new commit on the parent's parents
with the updated contents. Then it changes the working copy parent to this
@@ -405,77 +1816,13 @@
Returns 0 on success, 1 if nothing changed.
"""
-
- # determine updates to subsume
- old = scmutil.revsingle(repo, opts.get('change') or '.')
-
- lock = repo.lock()
- try:
- wlock = repo.wlock()
- try:
- if old.phase() == phases.public:
- raise util.Abort(_("can not rewrite immutable changeset %s")
- % old)
- if not repo.revs('%d and (::.)', old):
- raise error.Abort(_('cannot amend non ancestor changeset'))
- tr = repo.transaction('amend')
- try:
- oldphase = old.phase()
- # commit current changes as update
- # code copied from commands.commit to avoid noisy messages
- ciopts = dict(opts)
- ciopts.pop('message', None)
- ciopts.pop('logfile', None)
- ciopts['message'] = opts.get('note') or ('amends %s' % old.hex())
- e = cmdutil.commiteditor
- def commitfunc(ui, repo, message, match, opts):
- return repo.commit(message, opts.get('user'), opts.get('date'),
- match, editor=e)
- revcount = len(repo)
- tempid = cmdutil.commit(ui, repo, commitfunc, pats, ciopts)
- if len(repo) == revcount:
- # No revision created
- tempid = None
-
- # find all changesets to be considered updates
- head = repo['.']
- updatenodes = set(repo.changelog.nodesbetween(
- roots=[old.node()], heads=[head.node()])[0])
- updatenodes.remove(old.node())
- okoptions = ['message', 'logfile', 'edit', 'user']
- if not updatenodes:
- for o in okoptions:
- if opts.get(o):
- break
- else:
- raise error.Abort(_('no updates found'))
- updates = [repo[n] for n in updatenodes]
-
- # perform amend
- if opts.get('edit'):
- opts['force_editor'] = True
- newid, created = rewrite(repo, old, updates, head,
- [old.p1().node(), old.p2().node()], opts)
- if created:
- # reroute the working copy parent to the new changeset
- phases.retractboundary(repo, oldphase, [newid])
- repo.dirstate.setparents(newid, node.nullid)
- else:
- # rewrite() recreated an existing revision, discard
- # the intermediate revision if any. No need to update
- # phases or parents.
- if tempid is not None:
- repo.addobsolete(node.nullid, tempid)
- # XXX: need another message in collapse case.
- tr.close()
- raise error.Abort(_('no updates found'))
- tr.close()
- finally:
- tr.release()
- finally:
- wlock.release()
- finally:
- lock.release()
+ opts = opts.copy()
+ edit = opts.pop('edit', False)
+ opts['amend'] = True
+ if not (edit or opts['message']):
+ opts['message'] = repo['.'].description()
+ _alias, commitcmd = cmdutil.findcmd('commit', commands.table)
+ return commitcmd[0](ui, repo, *pats, **opts)
def _commitfiltered(repo, ctx, match):
"""Recommit ctx with changed files not in match. Return the new
@@ -497,10 +1844,10 @@
raise IOError()
fctx = ctx[path]
flags = fctx.flags()
- mctx = context.memfilectx(fctx.path(), fctx.data(),
- islink='l' in flags,
- isexec='x' in flags,
- copied=copied.get(path))
+ mctx = memfilectx(repo, fctx.path(), fctx.data(),
+ islink='l' in flags,
+ isexec='x' in flags,
+ copied=copied.get(path))
return mctx
new = context.memctx(repo,
@@ -566,13 +1913,13 @@
def uncommit(ui, repo, *pats, **opts):
"""move changes from parent revision to working directory
- Changes to selected files in parent revision appear again as
+ Changes to selected files in the checked out revision appear again as
uncommitted changed in the working directory. A new revision
- without selected changes is created, becomes the new parent and
- obsoletes the previous one.
+ without the selected changes is created, becomes the checked out
+ revision, and obsoletes the previous one.
- The --include option specify pattern to uncommit
- The --exclude option specify pattern to keep in the commit
+ The --include option specifies patterns to uncommit.
+ The --exclude option specifies patterns to keep in the commit.
Return 0 if changed files are uncommitted.
"""
@@ -601,21 +1948,25 @@
if newid is None:
raise util.Abort(_('nothing to uncommit'))
# Move local changes on filtered changeset
- repo.addobsolete(newid, old.node())
+ createmarkers(repo, [(old, (repo[newid],))])
phases.retractboundary(repo, oldphase, [newid])
repo.dirstate.setparents(newid, node.nullid)
_uncommitdirstate(repo, old, match)
updatebookmarks(newid)
if not repo[newid].files():
ui.warn(_("new changeset is empty\n"))
- ui.status(_('(use "hg kill ." to remove it)\n'))
+ ui.status(_('(use "hg prune ." to remove it)\n'))
finally:
wlock.release()
finally:
lock.release()
+@eh.wrapcommand('commit')
def commitwrapper(orig, ui, repo, *arg, **kwargs):
- lock = repo.lock()
+ if kwargs.get('amend', False):
+ lock = None
+ else:
+ lock = repo.lock()
try:
obsoleted = kwargs.get('obsolete', [])
if obsoleted:
@@ -624,19 +1975,156 @@
if not result: # commit successed
new = repo['-1']
oldbookmarks = []
+ markers = []
for old in obsoleted:
oldbookmarks.extend(repo.nodebookmarks(old.node()))
- repo.addobsolete(new.node(), old.node())
+ markers.append((old, (new,)))
+ if markers:
+ createmarkers(repo, markers)
for book in oldbookmarks:
repo._bookmarks[book] = new.node()
if oldbookmarks:
- bookmarks.write(repo)
+ repo._bookmarks.write()
return result
finally:
- lock.release()
+ if lock is not None:
+ lock.release()
+
+@command('^touch',
+ [('r', 'rev', [], 'revision to update'),
+ ('D', 'duplicate', False,
+ 'do not mark the new revision as successor of the old one')],
+ # allow to choose the seed ?
+ _('[-r] revs'))
+def touch(ui, repo, *revs, **opts):
+ """Create successors that are identical to their predecessors except for the changeset ID
+
+ This is used to "resurrect" changesets
+ """
+ duplicate = opts['duplicate']
+ revs = list(revs)
+ revs.extend(opts['rev'])
+ if not revs:
+ revs = ['.']
+ revs = scmutil.revrange(repo, revs)
+ if not revs:
+ ui.write_err('no revision to touch\n')
+ return 1
+ if not duplicate and repo.revs('public() and %ld', revs):
+ raise util.Abort("can't touch public revision")
+ wlock = lock = None
+ try:
+ wlock = repo.wlock()
+ lock = repo.lock()
+ tr = repo.transaction('touch')
+ revs.sort() # ensure parent are run first
+ newmapping = {}
+ try:
+ for r in revs:
+ ctx = repo[r]
+ extra = ctx.extra().copy()
+ extra['__touch-noise__'] = random.randint(0, 0xffffffff)
+ # search for touched parent
+ p1 = ctx.p1().node()
+ p2 = ctx.p2().node()
+ p1 = newmapping.get(p1, p1)
+ p2 = newmapping.get(p2, p2)
+ new, _ = rewrite(repo, ctx, [], ctx,
+ [p1, p2],
+ commitopts={'extra': extra})
+ # store touched version to help potential children
+ newmapping[ctx.node()] = new
+ if not duplicate:
+ createmarkers(repo, [(ctx, (repo[new],))])
+ phases.retractboundary(repo, ctx.phase(), [new])
+ if ctx in repo[None].parents():
+ repo.dirstate.setparents(new, node.nullid)
+ tr.close()
+ finally:
+ tr.release()
+ finally:
+ lockmod.release(lock, wlock)
+
+@command('^fold|squash',
+ [('r', 'rev', [], _("explicitly specify the full set of revision to fold")),
+ ] + commitopts + commitopts2,
+ # allow to choose the seed ?
+ _('rev'))
+def fold(ui, repo, *revs, **opts):
+ """Fold multiple revisions into a single one
+
+ The revisions from your current working directory to the given one are folded
+ into a single successor revision.
+ you can alternatively use --rev to explicitly specify revisions to be folded,
+ ignoring the current working directory parent.
+ """
+ revs = list(revs)
+ if revs:
+ if opts.get('rev', ()):
+ raise util.Abort("cannot specify both --rev and a target revision")
+ targets = scmutil.revrange(repo, revs)
+ revs = repo.revs('(%ld::.) or (.::%ld)', targets, targets)
+ elif 'rev' in opts:
+ revs = scmutil.revrange(repo, opts['rev'])
+ else:
+ revs = ()
+ if not revs:
+ ui.write_err('no revision to fold\n')
+ return 1
+ roots = repo.revs('roots(%ld)', revs)
+ if len(roots) > 1:
+ raise util.Abort("set has multiple roots")
+ root = repo[roots[0]]
+ if root.phase() <= phases.public:
+ raise util.Abort("can't fold public revisions")
+ heads = repo.revs('heads(%ld)', revs)
+ if len(heads) > 1:
+ raise util.Abort("set has multiple heads")
+ head = repo[heads[0]]
+ wlock = lock = None
+ try:
+ wlock = repo.wlock()
+ lock = repo.lock()
+ tr = repo.transaction('touch')
+ try:
+ commitopts = opts.copy()
+ allctx = [repo[r] for r in revs]
+ targetphase = max(c.phase() for c in allctx)
+
+ if commitopts.get('message') or commitopts.get('logfile'):
+ commitopts['edit'] = False
+ else:
+ msgs = ["HG: This is a fold of %d changesets." % len(allctx)]
+ msgs += ["HG: Commit message of changeset %s.\n\n%s\n" %
+ (c.rev(), c.description()) for c in allctx]
+ commitopts['message'] = "\n".join(msgs)
+ commitopts['edit'] = True
+
+ newid, _ = rewrite(repo, root, allctx, head,
+ [root.p1().node(), root.p2().node()],
+ commitopts=commitopts)
+ phases.retractboundary(repo, targetphase, [newid])
+ createmarkers(repo, [(ctx, (repo[newid],))
+ for ctx in allctx])
+ tr.close()
+ finally:
+ tr.release()
+ ui.status('%i changesets folded\n' % len(revs))
+ if repo['.'].rev() in revs:
+ hg.update(repo, newid)
+ finally:
+ lockmod.release(lock, wlock)
+
+
+
+@eh.wrapcommand('graft')
def graftwrapper(orig, ui, repo, *revs, **kwargs):
+ kwargs = dict(kwargs)
+ revs = list(revs) + kwargs.get('rev', [])
+ kwargs['rev'] = []
obsoleted = kwargs.setdefault('obsolete', [])
+
lock = repo.lock()
try:
if kwargs.get('old_obsolete'):
@@ -648,34 +2136,585 @@
obsoleted[:] = [str(i) for i in repo.revs('%lr', obsoleted)]
if obsoleted and len(revs) > 1:
- raise error.Abort(_('Can not graft multiple revision while '
+ raise error.Abort(_('cannot graft multiple revisions while '
'obsoleting (for now).'))
return commitwrapper(orig, ui, repo,*revs, **kwargs)
finally:
lock.release()
-def extsetup(ui):
- try:
- obsolete = extensions.find('obsolete')
- except KeyError:
- raise error.Abort(_('evolution extension requires obsolete extension.'))
+@eh.extsetup
+def oldevolveextsetup(ui):
try:
rebase = extensions.find('rebase')
except KeyError:
- rebase = None
raise error.Abort(_('evolution extension requires rebase extension.'))
- for cmd in ['amend', 'kill', 'uncommit']:
+ for cmd in ['kill', 'uncommit', 'touch', 'fold']:
entry = extensions.wrapcommand(cmdtable, cmd,
- obsolete.warnobserrors)
+ warnobserrors)
- entry = extensions.wrapcommand(commands.table, 'commit', commitwrapper)
+ entry = cmdutil.findcmd('commit', commands.table)[1]
entry[1].append(('o', 'obsolete', [],
_("make commit obsolete this revision")))
- entry = extensions.wrapcommand(commands.table, 'graft', graftwrapper)
+ entry = cmdutil.findcmd('graft', commands.table)[1]
entry[1].append(('o', 'obsolete', [],
_("make graft obsoletes this revision")))
entry[1].append(('O', 'old-obsolete', False,
_("make graft obsoletes its source")))
+#####################################################################
+### Obsolescence marker exchange experimenation ###
+#####################################################################
+
+@command('debugobsoleterelevant',
+ [],
+ 'REVSET')
+def debugobsoleterelevant(ui, repo, *revsets):
+ """print allobsolescence marker relevant to a set of revision"""
+ nodes = [ctx.node() for ctx in repo.set('%lr', revsets)]
+ markers = repo.obsstore.relevantmarkers(nodes)
+ for rawmarker in sorted(markers):
+ marker = obsolete.marker(repo, rawmarker)
+ cmdutil.showmarker(ui, marker)
+
+@eh.addattr(obsolete.obsstore, 'relevantmarkers')
+def relevantmarkers(self, nodes):
+ """return a set of all obsolescence marker relevant to a set of node.
+
+ "relevant" to a set of node mean:
+
+ - marker that use this changeset as successors
+ - prune marker of direct children on this changeset.
+ - recursive application of the two rules on precursors of these markers
+
+ It a set so you cannot rely on order"""
+ seennodes = set(nodes)
+ seenmarkers = set()
+ pendingnodes = set(nodes)
+ precursorsmarkers = self.precursors
+ prunedchildren = self.prunedchildren
+ while pendingnodes:
+ direct = set()
+ for current in pendingnodes:
+ direct.update(precursorsmarkers.get(current, ()))
+ direct.update(prunedchildren.get(current, ()))
+ direct -= seenmarkers
+ pendingnodes = set([m[0] for m in direct])
+ seenmarkers |= direct
+ pendingnodes -= seennodes
+ seennodes |= pendingnodes
+ return seenmarkers
+
+
+_pushkeyescape = getattr(obsolete, '_pushkeyescape', None)
+if _pushkeyescape is None:
+ _maxpayload = 5300
+ def _pushkeyescape(markers):
+ """encode markers into a dict suitable for pushkey exchange
+
+ - binary data are base86 encoded
+ - splited in chunk less than 5300 bytes"""
+ parts = []
+ currentlen = _maxpayload * 2 # ensure we create a new part
+ for marker in markers:
+ nextdata = obsolete._encodeonemarker(marker)
+ if (len(nextdata) + currentlen > _maxpayload):
+ currentpart = []
+ currentlen = 0
+ parts.append(currentpart)
+ currentpart.append(nextdata)
+ currentlen += len(nextdata)
+ keys = {}
+ for idx, part in enumerate(reversed(parts)):
+ data = ''.join([_pack('>B', 0)] + part)
+ keys['dump%i' % idx] = base85.b85encode(data)
+ return keys
+
+def _encodemarkersstream(fp, markers):
+ fp.write(_pack('>B', 0))
+ for mark in markers:
+ fp.write(obsolete._encodeonemarker(mark))
+
+class pushobsmarkerStringIO(StringIO):
+ """hacky string io for progress"""
+
+ @util.propertycache
+ def length(self):
+ return len(self.getvalue())
+
+ def read(self, size):
+ self.ui.progress('OBSEXC', self.tell(), unit="bytes",
+ total=self.length)
+ return StringIO.read(self, size)
+
+ def __iter__(self):
+ d = self.read(4096)
+ while d:
+ yield d
+ d = self.read(4096)
+
+
+
+@eh.wrapfunction(exchange, '_pushobsolete')
+def _pushobsolete(orig, pushop):
+ """utility function to push obsolete markers to a remote"""
+ pushop.ui.debug('try to push obsolete markers to remote\n')
+ repo = pushop.repo
+ remote = pushop.remote
+ unfi = repo.unfiltered()
+ cl = unfi.changelog
+ if (obsolete._enabled and repo.obsstore and
+ 'obsolete' in remote.listkeys('namespaces')):
+ repo.ui.status("OBSEXC: computing relevant nodes\n")
+ revs = unfi.revs('::%ln', pushop.commonheads)
+ common = []
+ if remote.capable('_evoext_obshash_0'):
+ repo.ui.status("OBSEXC: looking for common markers in %i nodes\n"
+ % len(revs))
+ common = findcommonobsmarkers(pushop.ui, repo, remote, revs)
+ revs = list(unfi.revs('%ld - (::%ln)', revs, common))
+ nodes = [cl.node(r) for r in revs]
+ if nodes:
+ repo.ui.status("OBSEXC: computing markers relevant to %i nodes\n"
+ % len(nodes))
+ markers = repo.obsstore.relevantmarkers(nodes)
+ else:
+ repo.ui.status("OBSEXC: markers already in sync\n")
+ markers = []
+ if not markers:
+ repo.ui.status("OBSEXC: no marker to push\n")
+ elif remote.capable('_evoext_b2x_obsmarkers_0'):
+ obsdata = pushobsmarkerStringIO()
+ _encodemarkersstream(obsdata, markers)
+ obsdata.seek(0)
+ obsdata.ui = repo.ui
+ repo.ui.status("OBSEXC: pushing %i markers (%i bytes)\n"
+ % (len(markers), len(obsdata.getvalue())))
+ bundler = bundle2.bundle20(pushop.ui, {})
+ capsblob = bundle2.encodecaps(pushop.repo.bundle2caps)
+ bundler.addpart(bundle2.bundlepart('b2x:replycaps', data=capsblob))
+ cgpart = bundle2.bundlepart('EVOLVE:B2X:OBSMARKERV1', data=obsdata)
+ bundler.addpart(cgpart)
+ stream = util.chunkbuffer(bundler.getchunks())
+ try:
+ reply = pushop.remote.unbundle(stream, ['force'], 'push')
+ except bundle2.UnknownPartError, exc:
+ raise util.Abort('missing support for %s' % exc)
+ try:
+ op = bundle2.processbundle(pushop.repo, reply)
+ except bundle2.UnknownPartError, exc:
+ raise util.Abort('missing support for %s' % exc)
+ repo.ui.progress('OBSEXC', None)
+ elif remote.capable('_evoext_pushobsmarkers_0'):
+ obsdata = pushobsmarkerStringIO()
+ _encodemarkersstream(obsdata, markers)
+ obsdata.seek(0)
+ obsdata.ui = repo.ui
+ repo.ui.status("OBSEXC: pushing %i markers (%i bytes)\n"
+ % (len(markers), len(obsdata.getvalue())))
+ remote.evoext_pushobsmarkers_0(obsdata)
+ repo.ui.progress('OBSEXC', None)
+ else:
+ rslts = []
+ remotedata = _pushkeyescape(markers).items()
+ totalbytes = sum(len(d) for k,d in remotedata)
+ sentbytes = 0
+ repo.ui.status("OBSEXC: pushing %i markers in %i pushkey payload (%i bytes)\n"
+ % (len(markers), len(remotedata), totalbytes))
+ for key, data in remotedata:
+ repo.ui.progress('OBSEXC', sentbytes, item=key, unit="bytes",
+ total=totalbytes)
+ rslts.append(remote.pushkey('obsolete', key, '', data))
+ sentbytes += len(data)
+ repo.ui.progress('OBSEXC', sentbytes, item=key, unit="bytes",
+ total=totalbytes)
+ repo.ui.progress('OBSEXC', None)
+ if [r for r in rslts if not r]:
+ msg = _('failed to push some obsolete markers!\n')
+ repo.ui.warn(msg)
+ repo.ui.status("OBSEXC: DONE\n")
+
+
+@eh.addattr(wireproto.wirepeer, 'evoext_pushobsmarkers_0')
+def client_pushobsmarkers(self, obsfile):
+ """wireprotocol peer method"""
+ self.requirecap('_evoext_pushobsmarkers_0',
+ _('push obsolete markers faster'))
+ ret, output = self._callpush('evoext_pushobsmarkers_0', obsfile)
+ for l in output.splitlines(True):
+ self.ui.status(_('remote: '), l)
+ return ret
+
+@eh.addattr(httppeer.httppeer, 'evoext_pushobsmarkers_0')
+def httpclient_pushobsmarkers(self, obsfile):
+ """httpprotocol peer method
+ (Cannot simply use _callpush as http is doing some special handling)"""
+ self.requirecap('_evoext_pushobsmarkers_0',
+ _('push obsolete markers faster'))
+ ret, output = self._call('evoext_pushobsmarkers_0', data=obsfile)
+ for l in output.splitlines(True):
+ if l.strip():
+ self.ui.status(_('remote: '), l)
+ return ret
+
+
+def srv_pushobsmarkers(repo, proto):
+ """wireprotocol command"""
+ fp = StringIO()
+ proto.redirect()
+ proto.getfile(fp)
+ data = fp.getvalue()
+ fp.close()
+ lock = repo.lock()
+ try:
+ tr = repo.transaction('pushkey: obsolete markers')
+ try:
+ repo.obsstore.mergemarkers(tr, data)
+ tr.close()
+ finally:
+ tr.release()
+ finally:
+ lock.release()
+ repo.hook('evolve_pushobsmarkers')
+ return wireproto.pushres(0)
+
+@bundle2.parthandler('evolve:b2x:obsmarkerv1')
+def handleobsmarkerv1(op, inpart):
+ """add a stream of obsmarker to the repo"""
+ tr = op.gettransaction()
+ advparams = dict(inpart.advisoryparams)
+ length = advparams.get('totalbytes')
+ if length is None:
+ obsdata = inpart.read()
+ else:
+ length = int(length)
+ data = StringIO()
+ current = 0
+ op.ui.progress('OBSEXC', current, unit="bytes", total=length)
+ while current < length:
+ readsize = min(length-current, 4096)
+ data.write(inpart.read(readsize))
+ current += readsize
+ op.ui.progress('OBSEXC', current, unit="bytes", total=length)
+ op.ui.progress('OBSEXC', None)
+ obsdata = data.getvalue()
+ totalsize = len(obsdata)
+ old = len(op.repo.obsstore._all)
+ op.repo.obsstore.mergemarkers(tr, obsdata)
+ new = len(op.repo.obsstore._all) - old
+ op.records.add('evo_obsmarkers', {'new': new, 'bytes': totalsize})
+ tr.hookargs['evolve_new_obsmarkers'] = str(new)
+
+def _buildpullobsmerkersboundaries(pullop):
+ """small funtion returning the argument for pull markers call
+ may to contains 'heads' and 'common'. skip the key for None.
+
+ Its a separed functio to play around with strategy for that."""
+ repo = pullop.repo
+ cl = pullop.repo.changelog
+ remote = pullop.remote
+ unfi = repo.unfiltered()
+ revs = unfi.revs('::%ln', pullop.pulledsubset)
+ common = [nullid]
+ if remote.capable('_evoext_obshash_0'):
+ repo.ui.status("OBSEXC: looking for common markers in %i nodes\n"
+ % len(revs))
+ common = findcommonobsmarkers(repo.ui, repo, remote, revs)
+ return {'heads': pullop.pulledsubset, 'common': common}
+
+@eh.uisetup
+def addgetbundleargs(self):
+ if gboptsmap is not None:
+ gboptsmap['evo_obsmarker'] = 'plain'
+ gboptsmap['evo_obscommon'] = 'plain'
+ gboptsmap['evo_obsheads'] = 'plain'
+ else:
+ gboptslist.append('evo_obsheads')
+ gboptslist.append('evo_obscommon')
+ gboptslist.append('evo_obsmarker')
+
+
+
+@eh.wrapfunction(exchange, '_getbundleextrapart')
+def _getbundleextrapart(orig, bundler, repo, source, **kwargs):
+ if int(kwargs.pop('evo_obsmarker', False)):
+ common = kwargs.pop('evo_obscommon')
+ common = wireproto.decodelist(common)
+ heads = kwargs.pop('evo_obsheads')
+ heads = wireproto.decodelist(heads)
+ obsdata = _getobsmarkersstream(repo, common=common, heads=heads)
+ if len(obsdata.getvalue()) > 5:
+ advparams = [('totalbytes', str(len(obsdata.getvalue())))]
+ obspart = bundle2.bundlepart('EVOLVE:B2X:OBSMARKERV1',
+ advisoryparams=advparams,
+ data=obsdata)
+ bundler.addpart(obspart)
+ orig(bundler, repo, source)
+
+@eh.wrapfunction(exchange, '_pullobsolete')
+def _pullobsolete(orig, pullop):
+ if not obsolete._enabled:
+ return None
+ b2xpull = pullop.remote.capable('_evoext_b2x_obsmarkers_0')
+ wirepull = pullop.remote.capable('_evoext_pullobsmarkers_0')
+ if not (b2xpull or wirepull):
+ return orig(pullop)
+ if 'obsolete' not in pullop.remote.listkeys('namespaces'):
+ return None # remote opted out of obsolescence marker exchange
+ tr = None
+ ui = pullop.repo.ui
+ ui.status("OBSEXC: pull obsolescence markers\n")
+ boundaries = _buildpullobsmerkersboundaries(pullop)
+ new = 0
+
+ if b2xpull:
+ kwargs = {'bundlecaps': set(['HG2X'])}
+ capsblob = bundle2.encodecaps(pullop.repo.bundle2caps)
+ kwargs['bundlecaps'].add('bundle2=' + urllib.quote(capsblob))
+ kwargs['heads'] = [nullid]
+ kwargs['common'] = [nullid]
+ kwargs['evo_obsmarker'] = '1'
+ kwargs['evo_obscommon'] = wireproto.encodelist(boundaries['common'])
+ kwargs['evo_obsheads'] = wireproto.encodelist(boundaries['heads'])
+ bundle = pullop.remote.getbundle('pull', **kwargs)
+ try:
+ op = bundle2.processbundle(pullop.repo, bundle, pullop.gettransaction)
+ except bundle2.UnknownPartError, exc:
+ raise util.Abort('missing support for %s' % exc)
+ bytes = new = 0
+ for entry in op.records['evo_obsmarkers']:
+ bytes += entry.get('bytes', 0)
+ new += entry.get('new', 0)
+ if 5 < bytes:
+ ui.status("OBSEXC: merging obsolescence markers (%i bytes)\n"
+ % bytes)
+ ui.status("OBSEXC: %i markers added\n" % new)
+ tr = op.gettransaction()
+ else:
+ ui.status("OBSEXC: no unknown remote markers\n")
+ ui.status("OBSEXC: DONE\n")
+ elif wirepull:
+ obsdata = pullop.remote.evoext_pullobsmarkers_0(**boundaries)
+ obsdata = obsdata.read()
+ if len(obsdata) > 5:
+ ui.status("OBSEXC: merging obsolescence markers (%i bytes)\n"
+ % len(obsdata))
+ tr = pullop.gettransaction()
+ old = len(pullop.repo.obsstore._all)
+ pullop.repo.obsstore.mergemarkers(tr, obsdata)
+ new = len(pullop.repo.obsstore._all) - old
+ ui.status("OBSEXC: %i markers added\n" % new)
+ else:
+ ui.status("OBSEXC: no unknown remote markers\n")
+ ui.status("OBSEXC: DONE\n")
+ if new:
+ pullop.repo.invalidatevolatilesets()
+ return tr
+
+def _getobsmarkersstream(repo, heads=None, common=None):
+ revset = ''
+ args = []
+ repo = repo.unfiltered()
+ if heads is None:
+ revset = 'all()'
+ elif heads:
+ revset += "(::%ln)"
+ args.append(heads)
+ else:
+ assert False, 'pulling no heads?'
+ if common:
+ revset += ' - (::%ln)'
+ args.append(common)
+ nodes = [c.node() for c in repo.set(revset, *args)]
+ markers = repo.obsstore.relevantmarkers(nodes)
+ obsdata = StringIO()
+ _encodemarkersstream(obsdata, markers)
+ obsdata.seek(0)
+ return obsdata
+
+@eh.addattr(wireproto.wirepeer, 'evoext_pullobsmarkers_0')
+def client_pullobsmarkers(self, heads=None, common=None):
+ self.requirecap('_evoext_pullobsmarkers_0', _('look up remote obsmarkers'))
+ opts = {}
+ if heads is not None:
+ opts['heads'] = wireproto.encodelist(heads)
+ if common is not None:
+ opts['common'] = wireproto.encodelist(common)
+ if util.safehasattr(self, '_callcompressable'):
+ f = self._callcompressable("evoext_pullobsmarkers_0", **opts)
+ else:
+ f = self._callstream("evoext_pullobsmarkers_0", **opts)
+ f = self._decompress(f)
+ length = int(f.read(20))
+ chunk = 4096
+ current = 0
+ data = StringIO()
+ ui = self.ui
+ ui.progress('OBSEXC', current, unit="bytes", total=length)
+ while current < length:
+ readsize = min(length-current, chunk)
+ data.write(f.read(readsize))
+ current += readsize
+ ui.progress('OBSEXC', current, unit="bytes", total=length)
+ ui.progress('OBSEXC', None)
+ data.seek(0)
+ return data
+
+@eh.addattr(localrepo.localpeer, 'evoext_pullobsmarkers_0')
+def local_pullobsmarkers(self, heads=None, common=None):
+ return _getobsmarkersstream(self._repo, heads=heads, common=common)
+
+def srv_pullobsmarkers(repo, proto, others):
+ opts = wireproto.options('', ['heads', 'common'], others)
+ for k, v in opts.iteritems():
+ if k in ('heads', 'common'):
+ opts[k] = wireproto.decodelist(v)
+ obsdata = _getobsmarkersstream(repo, **opts)
+ finaldata = StringIO()
+ obsdata = obsdata.getvalue()
+ finaldata.write('%20i' % len(obsdata))
+ finaldata.write(obsdata)
+ finaldata.seek(0)
+ return wireproto.streamres(proto.groupchunks(finaldata))
+
+def _obsrelsethashtree(repo):
+ cache = []
+ unfi = repo.unfiltered()
+ for i in unfi:
+ ctx = unfi[i]
+ entry = 0
+ sha = util.sha1()
+ # add data from p1
+ for p in ctx.parents():
+ p = p.rev()
+ if p < 0:
+ p = nullid
+ else:
+ p = cache[p][1]
+ if p != nullid:
+ entry += 1
+ sha.update(p)
+ tmarkers = repo.obsstore.relevantmarkers([ctx.node()])
+ if tmarkers:
+ bmarkers = [obsolete._encodeonemarker(m) for m in tmarkers]
+ bmarkers.sort()
+ for m in bmarkers:
+ entry += 1
+ sha.update(m)
+ if entry:
+ cache.append((ctx.node(), sha.digest()))
+ else:
+ cache.append((ctx.node(), nullid))
+ return cache
+
+@command('debugobsrelsethashtree',
+ [] , _(''))
+def debugobsrelsethashtree(ui, repo):
+ """display Obsolete markers, Relevant Set, Hash Tree
+ changeset-node obsrelsethashtree-node
+
+ It computed form the "orsht" of its parent and markers
+ relevant to the changeset itself."""
+ for chg, obs in _obsrelsethashtree(repo):
+ ui.status('%s %s\n' % (node.hex(chg), node.hex(obs)))
+
+
+### Set discovery START
+
+import random
+from mercurial import dagutil
+from mercurial import setdiscovery
+
+def _obshash(repo, nodes):
+ hashs = _obsrelsethashtree(repo)
+ nm = repo.changelog.nodemap
+ return [hashs[nm.get(n)][1] for n in nodes]
+
+def srv_obshash(repo, proto, nodes):
+ return wireproto.encodelist(_obshash(repo, wireproto.decodelist(nodes)))
+
+@eh.addattr(localrepo.localpeer, 'evoext_obshash')
+def local_obshash(peer, nodes):
+ return _obshash(peer._repo, nodes)
+
+@eh.addattr(wireproto.wirepeer, 'evoext_obshash')
+def peer_obshash(self, nodes):
+ d = self._call("evoext_obshash", nodes=wireproto.encodelist(nodes))
+ try:
+ return wireproto.decodelist(d)
+ except ValueError:
+ self._abort(error.ResponseError(_("unexpected response:"), d))
+
+def findcommonobsmarkers(ui, local, remote, probeset,
+ initialsamplesize=100,
+ fullsamplesize=200):
+ # from discovery
+ roundtrips = 0
+ cl = local.changelog
+ dag = dagutil.revlogdag(cl)
+ localhash = _obsrelsethashtree(local)
+ missing = set()
+ common = set()
+ undecided = set(probeset)
+ _takefullsample = setdiscovery._takefullsample
+
+ while undecided:
+
+ ui.note(_("sampling from both directions\n"))
+ sample = _takefullsample(dag, undecided, size=fullsamplesize)
+
+ roundtrips += 1
+ ui.debug("query %i; still undecided: %i, sample size is: %i\n"
+ % (roundtrips, len(undecided), len(sample)))
+ # indices between sample and externalized version must match
+ sample = list(sample)
+ remotehash = remote.evoext_obshash(dag.externalizeall(sample))
+
+ yesno = [localhash[ix][1] == remotehash[si]
+ for si, ix in enumerate(sample)]
+
+ commoninsample = set(n for i, n in enumerate(sample) if yesno[i])
+ common.update(dag.ancestorset(commoninsample, common))
+
+ missinginsample = [n for i, n in enumerate(sample) if not yesno[i]]
+ missing.update(dag.descendantset(missinginsample, missing))
+
+ undecided.difference_update(missing)
+ undecided.difference_update(common)
+
+
+ result = dag.headsetofconnecteds(common)
+ ui.debug("%d total queries\n" % roundtrips)
+
+ if not result:
+ return set([nullid])
+ return dag.externalizeall(result)
+
+@eh.wrapfunction(wireproto, 'capabilities')
+def capabilities(orig, repo, proto):
+ """wrapper to advertise new capability"""
+ caps = orig(repo, proto)
+ if obsolete._enabled:
+ caps += ' _evoext_pushobsmarkers_0'
+ caps += ' _evoext_pullobsmarkers_0'
+ caps += ' _evoext_obshash_0'
+ caps += ' _evoext_b2x_obsmarkers_0'
+ return caps
+
+
+@eh.extsetup
+def _installwireprotocol(ui):
+ localrepo.moderncaps.add('_evoext_pullobsmarkers_0')
+ localrepo.moderncaps.add('_evoext_b2x_obsmarkers_0')
+ hgweb_mod.perms['evoext_pushobsmarkers_0'] = 'push'
+ hgweb_mod.perms['evoext_pullobsmarkers_0'] = 'pull'
+ hgweb_mod.perms['evoext_obshash'] = 'pull'
+ wireproto.commands['evoext_pushobsmarkers_0'] = (srv_pushobsmarkers, '')
+ wireproto.commands['evoext_pullobsmarkers_0'] = (srv_pullobsmarkers, '*')
+ # wrap command content
+ oldcap, args = wireproto.commands['capabilities']
+ def newcap(repo, proto):
+ return capabilities(oldcap, repo, proto)
+ wireproto.commands['capabilities'] = (newcap, args)
+ wireproto.commands['evoext_obshash'] = (srv_obshash, 'nodes')
--- a/hgext/obsolete.py Thu Aug 23 18:09:45 2012 +0200
+++ b/hgext/obsolete.py Thu Jun 26 15:27:25 2014 +0100
@@ -1,781 +1,62 @@
-# obsolete.py - introduce the obsolete concept in mercurial.
-#
# Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Logilab SA <contact@logilab.fr>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
-"""Introduce the Obsolete concept to mercurial
-
-General concept
-===============
-
-This extension introduces the *obsolete* concept. It adds a new *obsolete*
-relation between two changesets. A relation ``<changeset B> obsolete <changeset
-A>`` is set to denote that ``<changeset B>`` is new version of ``<changeset
-A>``.
-
-The *obsolete* relation act as a **perpendicular history** to the standard
-changeset history. Standard changeset history versions files. The *obsolete*
-relation versions changesets.
-
-:obsolete: a changeset that has been replaced by another one.
-:unstable: a changeset that is not obsolete but has an obsolete ancestor.
-:suspended: an obsolete changeset with unstable descendant.
-:extinct: an obsolete changeset without unstable descendant.
- (subject to garbage collection)
-
-Another name for unstable could be out of sync.
-
-
-Usage and Feature
-=================
-
-Display and Exchange
---------------------
-
-obsolete changesets are hidden. (except if they have non obsolete changeset)
+"""Deprecated extension that formely introduces "Changeset Obsolescence".
-obsolete changesets are not exchanged. This will probably change later but it
-was the simpler solution for now.
-
-New commands
-------------
-
-Note that rebased changesets are now marked obsolete instead of being stripped.
-
-Context object
---------------
-
-Context gains a ``obsolete`` method that will return True if a changeset is
-obsolete False otherwise.
-
-revset
-------
+This concept is now partially in Mercurial core (starting with mercurial 2.3). The remaining logic have been grouped with the evolve extension.
-Add an ``obsolete()`` entry.
-
-repo extension
---------------
-
-To Do
-~~~~~
-
-- refuse to obsolete published changesets
-
-- handle split
-
-- handle conflict
-
-- handle unstable // out of sync
-
+Some code cemains in this extensions to detect and convert prehistoric format of obsolete marker than early user may have create. Keep it enabled if you were such user.
"""
-import os
-try:
- from cStringIO import StringIO
-except ImportError:
- from StringIO import StringIO
-
-from mercurial.i18n import _
-
-import base64
-import json
-
-import struct
-from mercurial import util, base85
-
-_pack = struct.pack
-_unpack = struct.unpack
-
from mercurial import util
-from mercurial import context
-from mercurial import revset
-from mercurial import scmutil
-from mercurial import extensions
-from mercurial import pushkey
-from mercurial import discovery
-from mercurial import error
-from mercurial import commands
-from mercurial import changelog
-from mercurial import phases
-from mercurial.node import hex, bin, short, nullid
-from mercurial.lock import release
-from mercurial import localrepo
-from mercurial import cmdutil
-from mercurial import templatekw
try:
- from mercurial.localrepo import storecache
- storecache('babar') # to trigger import
-except (TypeError, ImportError):
- def storecache(*args):
- return scmutil.filecache(*args, instore=True)
-
-
-### Patch changectx
-#############################
-
-def obsolete(ctx):
- """is the changeset obsolete by other"""
- if ctx.node()is None:
- return False
- return bool(ctx._repo.obsoletedby(ctx.node())) and ctx.phase()
-
-context.changectx.obsolete = obsolete
-
-def unstable(ctx):
- """is the changeset unstable (have obsolete ancestor)"""
- if ctx.node() is None:
- return False
- return ctx.rev() in ctx._repo._unstableset
-
-context.changectx.unstable = unstable
-
-def extinct(ctx):
- """is the changeset extinct by other"""
- if ctx.node() is None:
- return False
- return ctx.rev() in ctx._repo._extinctset
-
-context.changectx.extinct = extinct
-
-def latecomer(ctx):
- """is the changeset latecomer (Try to succeed to public change)"""
- if ctx.node() is None:
- return False
- return ctx.rev() in ctx._repo._latecomerset
-
-context.changectx.latecomer = latecomer
-
-def conflicting(ctx):
- """is the changeset conflicting (Try to succeed to public change)"""
- if ctx.node() is None:
- return False
- return ctx.rev() in ctx._repo._conflictingset
-
-context.changectx.conflicting = conflicting
-
-
-### revset
-#############################
-
-def revsethidden(repo, subset, x):
- """hidden changesets"""
- args = revset.getargs(x, 0, 0, 'hidden takes no argument')
- return [r for r in subset if r in repo.changelog.hiddenrevs]
-
-def revsetobsolete(repo, subset, x):
- """obsolete changesets"""
- args = revset.getargs(x, 0, 0, 'obsolete takes no argument')
- return [r for r in subset if r in repo._obsoleteset and repo._phasecache.phase(repo, r) > 0]
-
-# XXX Backward compatibility, to be removed once stabilized
-if '_phasecache' not in vars(localrepo.localrepository): # new api
- def revsetobsolete(repo, subset, x):
- """obsolete changesets"""
- args = revset.getargs(x, 0, 0, 'obsolete takes no argument')
- return [r for r in subset if r in repo._obsoleteset and repo._phaserev[r] > 0]
-
-def revsetunstable(repo, subset, x):
- """non obsolete changesets descendant of obsolete one"""
- args = revset.getargs(x, 0, 0, 'unstable takes no arguments')
- return [r for r in subset if r in repo._unstableset]
-
-def revsetsuspended(repo, subset, x):
- """obsolete changesets with non obsolete descendants"""
- args = revset.getargs(x, 0, 0, 'suspended takes no arguments')
- return [r for r in subset if r in repo._suspendedset]
-
-def revsetextinct(repo, subset, x):
- """obsolete changesets without obsolete descendants"""
- args = revset.getargs(x, 0, 0, 'extinct takes no arguments')
- return [r for r in subset if r in repo._extinctset]
-
-def revsetlatecomer(repo, subset, x):
- """latecomer, Try to succeed to public change"""
- args = revset.getargs(x, 0, 0, 'latecomer takes no arguments')
- return [r for r in subset if r in repo._latecomerset]
-
-def revsetconflicting(repo, subset, x):
- """conflicting, Try to succeed to public change"""
- args = revset.getargs(x, 0, 0, 'conflicting takes no arguments')
- return [r for r in subset if r in repo._conflictingset]
+ from mercurial import obsolete
+ if not obsolete._enabled:
+ obsolete._enabled = True
+except ImportError:
+ raise util.Abort('Obsolete extension requires Mercurial 2.3 (or later)')
-def _precursors(repo, s):
- """Precursor of a changeset"""
- cs = set()
- nm = repo.changelog.nodemap
- markerbysubj = repo.obsstore.successors
- for r in s:
- for p in markerbysubj.get(repo[r].node(), ()):
- pr = nm.get(p[0])
- if pr is not None:
- cs.add(pr)
- return cs
-
-def revsetprecursors(repo, subset, x):
- """precursors of a subset"""
- s = revset.getset(repo, range(len(repo)), x)
- cs = _precursors(repo, s)
- return [r for r in subset if r in cs]
-
-def _allprecursors(repo, s): # XXX we need a better naming
- """transitive precursors of a subset"""
- toproceed = [repo[r].node() for r in s]
- seen = set()
- allsubjects = repo.obsstore.successors
- while toproceed:
- nc = toproceed.pop()
- for mark in allsubjects.get(nc, ()):
- np = mark[0]
- if np not in seen:
- seen.add(np)
- toproceed.append(np)
- nm = repo.changelog.nodemap
- cs = set()
- for p in seen:
- pr = nm.get(p)
- if pr is not None:
- cs.add(pr)
- return cs
-
-def revsetallprecursors(repo, subset, x):
- """obsolete parents"""
- s = revset.getset(repo, range(len(repo)), x)
- cs = _allprecursors(repo, s)
- return [r for r in subset if r in cs]
+import sys
+import json
-def _successors(repo, s):
- """Successors of a changeset"""
- cs = set()
- nm = repo.changelog.nodemap
- markerbyobj = repo.obsstore.precursors
- for r in s:
- for p in markerbyobj.get(repo[r].node(), ()):
- for sub in p[1]:
- sr = nm.get(sub)
- if sr is not None:
- cs.add(sr)
- return cs
-
-def revsetsuccessors(repo, subset, x):
- """successors of a subset"""
- s = revset.getset(repo, range(len(repo)), x)
- cs = _successors(repo, s)
- return [r for r in subset if r in cs]
-
-def _allsuccessors(repo, s): # XXX we need a better naming
- """transitive successors of a subset"""
- toproceed = [repo[r].node() for r in s]
- seen = set()
- allobjects = repo.obsstore.precursors
- while toproceed:
- nc = toproceed.pop()
- for mark in allobjects.get(nc, ()):
- for sub in mark[1]:
- if sub == nullid:
- continue # should not be here!
- if sub not in seen:
- seen.add(sub)
- toproceed.append(sub)
- nm = repo.changelog.nodemap
- cs = set()
- for s in seen:
- sr = nm.get(s)
- if sr is not None:
- cs.add(sr)
- return cs
-
-def revsetallsuccessors(repo, subset, x):
- """obsolete parents"""
- s = revset.getset(repo, range(len(repo)), x)
- cs = _allsuccessors(repo, s)
- return [r for r in subset if r in cs]
-
-
-### template keywords
-#####################
-
-def obsoletekw(repo, ctx, templ, **args):
- """:obsolete: String. The obsolescence level of the node, could be
- ``stable``, ``unstable``, ``suspended`` or ``extinct``.
- """
- rev = ctx.rev()
- if rev in repo._extinctset:
- return 'extinct'
- if rev in repo._suspendedset:
- return 'suspended'
- if rev in repo._unstableset:
- return 'unstable'
- return 'stable'
-
-### Other Extension compat
-############################
+from mercurial import cmdutil
+from mercurial import error
+from mercurial.node import bin, nullid
-def buildstate(orig, repo, dest, rebaseset, *ags, **kws):
- """wrapper for rebase 's buildstate that exclude obsolete changeset"""
- rebaseset = repo.revs('%ld - extinct()', rebaseset)
- return orig(repo, dest, rebaseset, *ags, **kws)
-
-def defineparents(orig, repo, rev, target, state, *args, **kwargs):
- rebasestate = getattr(repo, '_rebasestate', None)
- if rebasestate is not None:
- repo._rebasestate = dict(state)
- repo._rebasetarget = target
- return orig(repo, rev, target, state, *args, **kwargs)
-
-def concludenode(orig, repo, rev, p1, *args, **kwargs):
- """wrapper for rebase 's concludenode that set obsolete relation"""
- newrev = orig(repo, rev, p1, *args, **kwargs)
- rebasestate = getattr(repo, '_rebasestate', None)
- if rebasestate is not None:
- if newrev is not None:
- nrev = repo[newrev].rev()
- else:
- nrev = p1
- repo._rebasestate[rev] = nrev
- return newrev
-
-def cmdrebase(orig, ui, repo, *args, **kwargs):
-
- reallykeep = kwargs.get('keep', False)
- kwargs = dict(kwargs)
- kwargs['keep'] = True
+#####################################################################
+### Older format management ###
+#####################################################################
- # We want to mark rebased revision as obsolete and set their
- # replacements if any. Doing it in concludenode() prevents
- # aborting the rebase, and is not called with all relevant
- # revisions in --collapse case. Instead, we try to track the
- # rebase state structure by sampling/updating it in
- # defineparents() and concludenode(). The obsolete markers are
- # added from this state after a successful call.
- repo._rebasestate = {}
- repo._rebasetarget = None
- try:
- res = orig(ui, repo, *args, **kwargs)
- if not reallykeep:
- # Filter nullmerge or unrebased entries
- repo._rebasestate = dict(p for p in repo._rebasestate.iteritems()
- if p[1] >= 0)
- if not res and not kwargs.get('abort') and repo._rebasestate:
- # Rebased revisions are assumed to be descendants of
- # targetrev. If a source revision is mapped to targetrev
- # or to another rebased revision, it must have been
- # removed.
- targetrev = repo[repo._rebasetarget].rev()
- newrevs = set([targetrev])
- replacements = {}
- for rev, newrev in sorted(repo._rebasestate.items()):
- oldnode = repo[rev].node()
- if newrev not in newrevs:
- newnode = repo[newrev].node()
- newrevs.add(newrev)
- else:
- newnode = nullid
- replacements[oldnode] = newnode
-
- if kwargs.get('collapse'):
- newnodes = set(n for n in replacements.values() if n != nullid)
- if newnodes:
- # Collapsing into more than one revision?
- assert len(newnodes) == 1, newnodes
- newnode = newnodes.pop()
- else:
- newnode = nullid
- repo.addcollapsedobsolete(replacements, newnode)
- else:
- for oldnode, newnode in replacements.iteritems():
- repo.addobsolete(newnode, oldnode)
- return res
- finally:
- delattr(repo, '_rebasestate')
- delattr(repo, '_rebasetarget')
+# Code related to detection and management of older legacy format never
+# handled by core
-def extsetup(ui):
-
- revset.symbols["hidden"] = revsethidden
- revset.symbols["obsolete"] = revsetobsolete
- revset.symbols["unstable"] = revsetunstable
- revset.symbols["suspended"] = revsetsuspended
- revset.symbols["extinct"] = revsetextinct
- revset.symbols["latecomer"] = revsetlatecomer
- revset.symbols["conflicting"] = revsetconflicting
- revset.symbols["obsparents"] = revsetprecursors # DEPR
- revset.symbols["precursors"] = revsetprecursors
- revset.symbols["obsancestors"] = revsetallprecursors # DEPR
- revset.symbols["allprecursors"] = revsetallprecursors # bad name
- revset.symbols["successors"] = revsetsuccessors
- revset.symbols["allsuccessors"] = revsetallsuccessors # bad name
-
- templatekw.keywords['obsolete'] = obsoletekw
-
- # warning about more obsolete
- for cmd in ['commit', 'push', 'pull', 'graft', 'phase', 'unbundle']:
- entry = extensions.wrapcommand(commands.table, cmd, warnobserrors)
- try:
- rebase = extensions.find('rebase')
- if rebase:
- entry = extensions.wrapcommand(rebase.cmdtable, 'rebase', warnobserrors)
- extensions.wrapfunction(rebase, 'buildstate', buildstate)
- extensions.wrapfunction(rebase, 'defineparents', defineparents)
- extensions.wrapfunction(rebase, 'concludenode', concludenode)
- extensions.wrapcommand(rebase.cmdtable, "rebase", cmdrebase)
- except KeyError:
- pass # rebase not found
-
-# Pushkey mechanism for mutable
-#########################################
-
-def listmarkers(repo):
- """List markers over pushkey"""
- if not repo.obsstore:
- return {}
- data = repo.obsstore._writemarkers()
- encdata = base85.b85encode(data)
- return {'dump0': encdata,
- 'dump': encdata} # legacy compat
-
-def pushmarker(repo, key, old, new):
- """Push markers over pushkey"""
- if not key.startswith('dump'):
- repo.ui.warn(_('unknown key: %r') % key)
- return 0
- if old:
- repo.ui.warn(_('unexpected old value') % key)
- return 0
- data = base85.b85decode(new)
- lock = repo.lock()
- try:
- try:
- repo.obsstore.mergemarkers(data)
- return 1
- except util.Abort:
- return 0
- finally:
- lock.release()
-
-pushkey.register('obsolete', pushmarker, listmarkers)
-
-### Discovery wrapping
-#############################
-
-class blist(list, object):
- """silly class to have non False but empty list"""
-
- def __nonzero__(self):
- return bool(len(self.orig))
-
-def wrapfindcommonoutgoing(orig, repo, *args, **kwargs):
- """wrap mercurial.discovery.findcommonoutgoing to remove extinct changeset
-
- Such excluded changeset are removed from excluded and will *not* appear
- are excluded secret changeset.
- """
- outgoing = orig(repo, *args, **kwargs)
- orig = outgoing.excluded
- outgoing.excluded = blist(n for n in orig if not repo[n].extinct())
- # when no revision is specified (push everything) a shortcut is taken when
- # nothign was exclude. taking this code path when extinct changeset have
- # been excluded leads to repository corruption.
- outgoing.excluded.orig = orig
- return outgoing
-
-def wrapcheckheads(orig, repo, remote, outgoing, *args, **kwargs):
- """wrap mercurial.discovery.checkheads
-
- * prevent unstability to be pushed
- * patch remote to ignore obsolete heads on remote
- """
- # do not push instability
- for h in outgoing.missingheads:
- # checking heads only is enought because any thing base on obsolete
- # changeset is either obsolete or unstable.
- ctx = repo[h]
- if ctx.unstable():
- raise util.Abort(_("push includes an unstable changeset: %s!")
- % ctx)
- if ctx.obsolete():
- raise util.Abort(_("push includes an obsolete changeset: %s!")
- % ctx)
- if ctx.latecomer():
- raise util.Abort(_("push includes an latecomer changeset: %s!")
- % ctx)
- if ctx.conflicting():
- raise util.Abort(_("push includes conflicting changeset: %s!")
- % ctx)
- ### patch remote branch map
- # do not read it this burn eyes
- try:
- if 'oldbranchmap' not in vars(remote):
- remote.oldbranchmap = remote.branchmap
- def branchmap():
- newbm = {}
- oldbm = None
- if (util.safehasattr(phases, 'visiblebranchmap')
- and not util.safehasattr(remote, 'ignorevisiblebranchmap')
- ):
- remote.ignorevisiblebranchmap = False
- remote.branchmap = remote.oldbranchmap
- oldbm = phases.visiblebranchmap(remote)
- remote.branchmap = remote.newbranchmap
- remote.ignorevisiblebranchmap = True
- if oldbm is None:
- oldbm = remote.oldbranchmap()
- for branch, nodes in oldbm.iteritems():
- nodes = list(nodes)
- new = set()
- while nodes:
- n = nodes.pop()
- if n in repo.obsstore.precursors:
- markers = repo.obsstore.precursors[n]
- for mark in markers:
- for newernode in mark[1]:
- if newernode is not None:
- nodes.append(newernode)
- else:
- new.add(n)
- if new:
- newbm[branch] = list(new)
- return newbm
- remote.ignorevisiblebranchmap = True
- remote.branchmap = branchmap
- remote.newbranchmap = branchmap
- return orig(repo, remote, outgoing, *args, **kwargs)
- finally:
- remote.__dict__.pop('branchmap', None) # restore class one
- remote.__dict__.pop('oldbranchmap', None)
- remote.__dict__.pop('newbranchmap', None)
- remote.__dict__.pop('ignorevisiblebranchmap', None)
-
-# eye are still burning
-def wrapvisiblebranchmap(orig, repo):
- ignore = getattr(repo, 'ignorevisiblebranchmap', None)
- if ignore is None:
- return orig(repo)
- elif ignore:
- return repo.branchmap()
- else:
- return None # break recursion
-
-def wrapclearcache(orig, repo, *args, **kwargs):
- try:
- return orig(repo, *args, **kwargs)
- finally:
- repo._clearobsoletecache()
-
-
-### New commands
-#############################
-
-cmdtable = {}
-command = cmdutil.command(cmdtable)
-
-@command('debugobsolete', [], _('SUBJECT OBJECT'))
-def cmddebugobsolete(ui, repo, subject, object):
- """add an obsolete relation between two nodes
-
- The subject is expected to be a newer version of the object.
+def reposetup(ui, repo):
+ """Detect that a repo still contains some old obsolete format
"""
- lock = repo.lock()
- try:
- sub = repo[subject]
- obj = repo[object]
- repo.addobsolete(sub.node(), obj.node())
- finally:
- lock.release()
- return 0
-
-@command('debugconvertobsolete', [], '')
-def cmddebugconvertobsolete(ui, repo):
- """import markers from an .hg/obsolete-relations file"""
- cnt = 0
- err = 0
- l = repo.lock()
- some = False
- try:
- repo._importoldobsolete = True
- store = repo.obsstore
- ### very first format
- try:
- f = repo.opener('obsolete-relations')
- try:
- some = True
- for line in f:
- subhex, objhex = line.split()
- suc = bin(subhex)
- prec = bin(objhex)
- sucs = (suc==nullid) and [] or [suc]
- meta = {
- 'date': '%i %i' % util.makedate(),
- 'user': ui.username(),
- }
- try:
- store.create(prec, sucs, 0, meta)
- cnt += 1
- except ValueError:
- repo.ui.write_err("invalid old marker line: %s"
- % (line))
- err += 1
- finally:
- f.close()
- util.unlink(repo.join('obsolete-relations'))
- except IOError:
- pass
- ### second (json) format
- data = repo.sopener.tryread('obsoletemarkers')
+ if not repo.local():
+ return
+ for arg in sys.argv:
+ if 'debugc' in arg:
+ break
+ else:
+ data = repo.opener.tryread('obsolete-relations')
+ if not data:
+ data = repo.sopener.tryread('obsoletemarkers')
if data:
- some = True
- for oldmark in json.loads(data):
- del oldmark['id'] # dropped for now
- del oldmark['reason'] # unused until then
- oldobject = str(oldmark.pop('object'))
- oldsubjects = [str(s) for s in oldmark.pop('subjects', [])]
- LOOKUP_ERRORS = (error.RepoLookupError, error.LookupError)
- if len(oldobject) != 40:
- try:
- oldobject = repo[oldobject].node()
- except LOOKUP_ERRORS:
- pass
- if any(len(s) != 40 for s in oldsubjects):
- try:
- oldsubjects = [repo[s].node() for s in oldsubjects]
- except LOOKUP_ERRORS:
- pass
-
- oldmark['date'] = '%i %i' % tuple(oldmark['date'])
- meta = dict((k.encode('utf-8'), v.encode('utf-8'))
- for k, v in oldmark.iteritems())
- try:
- succs = [bin(n) for n in oldsubjects]
- succs = [n for n in succs if n != nullid]
- store.create(bin(oldobject), succs,
- 0, meta)
- cnt += 1
- except ValueError:
- repo.ui.write_err("invalid marker %s -> %s\n"
- % (oldobject, oldsubjects))
- err += 1
- util.unlink(repo.sjoin('obsoletemarkers'))
- finally:
- del repo._importoldobsolete
- l.release()
- if not some:
- ui.warn('nothing to do\n')
- ui.status('%i obsolete marker converted\n' % cnt)
- if err:
- ui.write_err('%i conversion failed. check you graph!\n' % err)
-
-@command('debugsuccessors', [], '')
-def cmddebugsuccessors(ui, repo):
- """dump obsolete changesets and their successors
-
- Each line matches an existing marker, the first identifier is the
- obsolete changeset identifier, followed by it successors.
- """
- lock = repo.lock()
- try:
- allsuccessors = repo.obsstore.precursors
- for old in sorted(allsuccessors):
- successors = [sorted(m[1]) for m in allsuccessors[old]]
- for i, group in enumerate(sorted(successors)):
- ui.write('%s' % short(old))
- for new in group:
- ui.write(' %s' % short(new))
- ui.write('\n')
- finally:
- lock.release()
-
-### Altering existing command
-#############################
-
-def wrapmayobsoletewc(origfn, ui, repo, *args, **opts):
- res = origfn(ui, repo, *args, **opts)
- if repo['.'].obsolete():
- ui.warn(_('Working directory parent is obsolete\n'))
- return res
-
-def warnobserrors(orig, ui, repo, *args, **kwargs):
- """display warning is the command resulted in more instable changeset"""
- priorunstables = len(repo.revs('unstable()'))
- priorlatecomers = len(repo.revs('latecomer()'))
- priorconflictings = len(repo.revs('conflicting()'))
- #print orig, priorunstables
- #print len(repo.revs('secret() - obsolete()'))
- try:
- return orig(ui, repo, *args, **kwargs)
- finally:
- newunstables = len(repo.revs('unstable()')) - priorunstables
- newlatecomers = len(repo.revs('latecomer()')) - priorlatecomers
- newconflictings = len(repo.revs('conflicting()')) - priorconflictings
- #print orig, newunstables
- #print len(repo.revs('secret() - obsolete()'))
- if newunstables > 0:
- ui.warn(_('%i new unstables changesets\n') % newunstables)
- if newlatecomers > 0:
- ui.warn(_('%i new latecomers changesets\n') % newlatecomers)
- if newconflictings > 0:
- ui.warn(_('%i new conflictings changesets\n') % newconflictings)
-
-def noextinctsvisibleheads(orig, repo):
- repo._turn_extinct_secret()
- return orig(repo)
-
-def wrapcmdutilamend(orig, ui, repo, commitfunc, old, *args, **kwargs):
- oldnode = old.node()
- new = orig(ui, repo, commitfunc, old, *args, **kwargs)
- if new != oldnode:
- lock = repo.lock()
- try:
- meta = {
- 'subjects': [new],
- 'object': oldnode,
- 'date': util.makedate(),
- 'user': ui.username(),
- 'reason': 'commit --amend',
- }
- repo.obsstore.create(oldnode, [new], 0, meta)
- repo._clearobsoletecache()
- repo._turn_extinct_secret()
- finally:
- lock.release()
- return new
-
-def uisetup(ui):
- extensions.wrapcommand(commands.table, "update", wrapmayobsoletewc)
- extensions.wrapcommand(commands.table, "pull", wrapmayobsoletewc)
- if util.safehasattr(cmdutil, 'amend'):
- extensions.wrapfunction(cmdutil, 'amend', wrapcmdutilamend)
- extensions.wrapfunction(discovery, 'findcommonoutgoing', wrapfindcommonoutgoing)
- extensions.wrapfunction(discovery, 'checkheads', wrapcheckheads)
- extensions.wrapfunction(phases, 'visibleheads', noextinctsvisibleheads)
- extensions.wrapfunction(phases, 'advanceboundary', wrapclearcache)
- if util.safehasattr(phases, 'visiblebranchmap'):
- extensions.wrapfunction(phases, 'visiblebranchmap', wrapvisiblebranchmap)
-
-### serialisation
-#############################
-
-def _obsserialise(obssubrels, flike):
- """serialise an obsolete relation mapping in a plain text one
-
- this is for subject -> [objects] mapping
-
- format is::
-
- <subject-full-hex> <object-full-hex>\n"""
- for sub, objs in obssubrels.iteritems():
- for obj in objs:
- if sub is None:
- sub = nullid
- flike.write('%s %s\n' % (hex(sub), hex(obj)))
+ raise util.Abort('old format of obsolete marker detected!\n'
+ 'run `hg debugconvertobsolete` once.')
def _obsdeserialise(flike):
"""read a file like object serialised with _obsserialise
- this desierialize into a {subject -> objects} mapping"""
+ this desierialize into a {subject -> objects} mapping
+
+ this was the very first format ever."""
rels = {}
for line in flike:
subhex, objhex = line.split()
@@ -785,527 +66,92 @@
rels.setdefault( subnode, set()).add(bin(objhex))
return rels
-### diagnostique tools
-#############################
-
-def unstables(repo):
- """Return all unstable changeset"""
- return scmutil.revrange(repo, ['obsolete():: and (not obsolete())'])
-
-def newerversion(repo, obs):
- """Return the newer version of an obsolete changeset"""
- toproceed = set([(obs,)])
- # XXX known optimization available
- newer = set()
- objectrels = repo.obsstore.precursors
- while toproceed:
- current = toproceed.pop()
- assert len(current) <= 1, 'splitting not handled yet. %r' % current
- current = [n for n in current if n != nullid]
- if current:
- n, = current
- if n in objectrels:
- markers = objectrels[n]
- for mark in markers:
- toproceed.add(tuple(mark[1]))
- else:
- newer.add(tuple(current))
- else:
- newer.add(())
- return sorted(newer)
-
-### obsolete relation storage
-#############################
-def add2set(d, key, mark):
- """add <mark> to a `set` in <d>[<key>]"""
- d.setdefault(key, []).append(mark)
-
-def markerid(marker):
- KEYS = ['subjects', "object", "date", "user", "reason"]
- for key in KEYS:
- assert key in marker
- keys = sorted(marker.keys())
- a = util.sha1()
- for key in keys:
- if key == 'subjects':
- for sub in sorted(marker[key]):
- a.update(sub)
- elif key == 'id':
- pass
- else:
- a.update(str(marker[key]))
- a.update('\0')
- return a.digest()
-
-# mercurial backport
-
-def encodemeta(meta):
- """Return encoded metadata string to string mapping.
-
- Assume no ':' in key and no '\0' in both key and value."""
- for key, value in meta.iteritems():
- if ':' in key or '\0' in key:
- raise ValueError("':' and '\0' are forbidden in metadata key'")
- if '\0' in value:
- raise ValueError("':' are forbidden in metadata value'")
- return '\0'.join(['%s:%s' % (k, meta[k]) for k in sorted(meta)])
-
-def decodemeta(data):
- """Return string to string dictionary from encoded version."""
- d = {}
- for l in data.split('\0'):
- if l:
- key, value = l.split(':')
- d[key] = value
- return d
-
-# data used for parsing and writing
-_fmversion = 0
-_fmfixed = '>BIB20s'
-_fmnode = '20s'
-_fmfsize = struct.calcsize(_fmfixed)
-_fnodesize = struct.calcsize(_fmnode)
-
-def _readmarkers(data):
- """Read and enumerate markers from raw data"""
- off = 0
- diskversion = _unpack('>B', data[off:off + 1])[0]
- off += 1
- if diskversion != _fmversion:
- raise util.Abort(_('parsing obsolete marker: unknown version %r')
- % diskversion)
-
- # Loop on markers
- l = len(data)
- while off + _fmfsize <= l:
- # read fixed part
- cur = data[off:off + _fmfsize]
- off += _fmfsize
- nbsuc, mdsize, flags, pre = _unpack(_fmfixed, cur)
- # read replacement
- sucs = ()
- if nbsuc:
- s = (_fnodesize * nbsuc)
- cur = data[off:off + s]
- sucs = _unpack(_fmnode * nbsuc, cur)
- off += s
- # read metadata
- # (metadata will be decoded on demand)
- metadata = data[off:off + mdsize]
- if len(metadata) != mdsize:
- raise util.Abort(_('parsing obsolete marker: metadata is too '
- 'short, %d bytes expected, got %d')
- % (len(metadata), mdsize))
- off += mdsize
- yield (pre, sucs, flags, metadata)
-
-class obsstore(object):
- """Store obsolete markers
-
- Markers can be accessed with two mappings:
- - precursors: old -> set(new)
- - successors: new -> set(old)
- """
-
- def __init__(self):
- self._all = []
- # new markers to serialize
- self._new = []
- self.precursors = {}
- self.successors = {}
-
- def __iter__(self):
- return iter(self._all)
-
- def __nonzero__(self):
- return bool(self._all)
-
- def create(self, prec, succs=(), flag=0, metadata=None):
- """obsolete: add a new obsolete marker
-
- * ensuring it is hashable
- * check mandatory metadata
- * encode metadata
- """
- if metadata is None:
- metadata = {}
- if len(prec) != 20:
- raise ValueError(repr(prec))
- for succ in succs:
- if len(succ) != 20:
- raise ValueError((succs))
- marker = (str(prec), tuple(succs), int(flag), encodemeta(metadata))
- self.add(marker)
-
- def add(self, marker):
- """Add a new marker to the store
-
- This marker still needs to be written to disk"""
- self._new.append(marker)
- self._load(marker)
-
- def loadmarkers(self, data):
- """Load all markers in data, mark them as known."""
- for marker in _readmarkers(data):
- self._load(marker)
-
- def mergemarkers(self, data):
- other = set(_readmarkers(data))
- local = set(self._all)
- new = other - local
- for marker in new:
- self.add(marker)
-
- def flushmarkers(self, stream):
- """Write all markers to a stream
-
- After this operation, "new" markers are considered "known"."""
- self._writemarkers(stream)
- self._new[:] = []
-
- def _load(self, marker):
- self._all.append(marker)
- pre, sucs = marker[:2]
- self.precursors.setdefault(pre, set()).add(marker)
- for suc in sucs:
- self.successors.setdefault(suc, set()).add(marker)
-
- def _writemarkers(self, stream=None):
- # Kept separate from flushmarkers(), it will be reused for
- # markers exchange.
- if stream is None:
- final = []
- w = final.append
- else:
- w = stream.write
- w(_pack('>B', _fmversion))
- for marker in self._all:
- pre, sucs, flags, metadata = marker
- nbsuc = len(sucs)
- format = _fmfixed + (_fmnode * nbsuc)
- data = [nbsuc, len(metadata), flags, pre]
- data.extend(sucs)
- w(_pack(format, *data))
- w(metadata)
- if stream is None:
- return ''.join(final)
-
-
-### repo subclassing
-#############################
-
-def reposetup(ui, repo):
- if not repo.local():
- return
-
- if not util.safehasattr(repo.opener, 'tryread'):
- raise util.Abort('Obsolete extension requires Mercurial 2.2 (or later)')
- opull = repo.pull
- opush = repo.push
- olock = repo.lock
- o_rollback = repo._rollback
- o_updatebranchcache = repo.updatebranchcache
-
- # /!\ api change in Hg 2.2 (97efd26eb9576f39590812ea9) /!\
- if util.safehasattr(repo, '_journalfiles'): # Hg 2.2
- o_journalfiles = repo._journalfiles
- o_writejournal = repo._writejournal
- o_hook = repo.hook
-
-
- class obsoletingrepo(repo.__class__):
-
- # workaround
- def hook(self, name, throw=False, **args):
- if 'pushkey' in name:
- args.pop('new')
- args.pop('old')
- return o_hook(name, throw=False, **args)
-
- ### Public method
- def obsoletedby(self, node):
- """return the set of node that make <node> obsolete (obj)"""
- others = set()
- for marker in self.obsstore.precursors.get(node, []):
- others.update(marker[1])
- return others
-
- def obsolete(self, node):
- """return the set of node that <node> make obsolete (sub)"""
- return set(marker[0] for marker in self.obsstore.successors.get(node, []))
-
- @storecache('obsstore')
- def obsstore(self):
- if not getattr(self, '_importoldobsolete', False):
- data = repo.opener.tryread('obsolete-relations')
- if not data:
- data = repo.sopener.tryread('obsoletemarkers')
- if data:
- raise util.Abort('old format of obsolete marker detected!\n'
- 'run `hg debugconvertobsolete` once.')
- store = obsstore()
- data = self.sopener.tryread('obsstore')
+cmdtable = {}
+command = cmdutil.command(cmdtable)
+@command('debugconvertobsolete', [], '')
+def cmddebugconvertobsolete(ui, repo):
+ """import markers from an .hg/obsolete-relations file"""
+ cnt = 0
+ err = 0
+ l = repo.lock()
+ some = False
+ try:
+ unlink = []
+ tr = repo.transaction('convert-obsolete')
+ try:
+ repo._importoldobsolete = True
+ store = repo.obsstore
+ ### very first format
+ try:
+ f = repo.opener('obsolete-relations')
+ try:
+ some = True
+ for line in f:
+ subhex, objhex = line.split()
+ suc = bin(subhex)
+ prec = bin(objhex)
+ sucs = (suc==nullid) and [] or [suc]
+ meta = {
+ 'date': '%i %i' % util.makedate(),
+ 'user': ui.username(),
+ }
+ try:
+ store.create(tr, prec, sucs, 0, meta)
+ cnt += 1
+ except ValueError:
+ repo.ui.write_err("invalid old marker line: %s"
+ % (line))
+ err += 1
+ finally:
+ f.close()
+ unlink.append(repo.join('obsolete-relations'))
+ except IOError:
+ pass
+ ### second (json) format
+ data = repo.sopener.tryread('obsoletemarkers')
if data:
- store.loadmarkers(data)
- return store
-
- @util.propertycache
- def _obsoleteset(self):
- """the set of obsolete revision"""
- obs = set()
- nm = self.changelog.nodemap
- for obj in self.obsstore.precursors:
- try: # /!\api change in Hg 2.2 (e8d37b78acfb22ae2c1fb126c2)/!\
- rev = nm.get(obj)
- except TypeError: #XXX to remove while breaking Hg 2.1 support
- rev = nm.get(obj, None)
- if rev is not None:
- obs.add(rev)
- return obs
-
- @util.propertycache
- def _unstableset(self):
- """the set of non obsolete revision with obsolete parent"""
- return set(self.revs('(obsolete()::) - obsolete()'))
-
- @util.propertycache
- def _suspendedset(self):
- """the set of obsolete parent with non obsolete descendant"""
- return set(self.revs('obsolete() and obsolete()::unstable()'))
-
- @util.propertycache
- def _extinctset(self):
- """the set of obsolete parent without non obsolete descendant"""
- return set(self.revs('obsolete() - obsolete()::unstable()'))
-
- @util.propertycache
- def _latecomerset(self):
- """the set of rev trying to obsolete public revision"""
- query = 'allsuccessors(public()) - obsolete() - public()'
- return set(self.revs(query))
-
- @util.propertycache
- def _conflictingset(self):
- """the set of rev trying to obsolete public revision"""
- conflicting = set()
- obsstore = self.obsstore
- newermap = {}
- for ctx in self.set('(not public()) - obsolete()'):
- prec = obsstore.successors.get(ctx.node(), ())
- toprocess = set(prec)
- while toprocess:
- prec = toprocess.pop()[0]
- if prec not in newermap:
- newermap[prec] = newerversion(self, prec)
- newer = [n for n in newermap[prec] if n] # filter kill
- if len(newer) > 1:
- conflicting.add(ctx.rev())
- break
- toprocess.update(obsstore.successors.get(prec, ()))
- return conflicting
-
- def _clearobsoletecache(self):
- if '_obsoleteset' in vars(self):
- del self._obsoleteset
- self._clearunstablecache()
-
- def updatebranchcache(self):
- o_updatebranchcache()
- self._clearunstablecache()
-
- def _clearunstablecache(self):
- if '_unstableset' in vars(self):
- del self._unstableset
- if '_suspendedset' in vars(self):
- del self._suspendedset
- if '_extinctset' in vars(self):
- del self._extinctset
- if '_latecomerset' in vars(self):
- del self._latecomerset
- if '_conflictingset' in vars(self):
- del self._conflictingset
-
- def addobsolete(self, sub, obj):
- """Add a relation marking that node <sub> is a new version of <obj>"""
- assert sub != obj
- if not repo[obj].phase():
- if sub is None:
- self.ui.warn(
- _("trying to kill immutable changeset %(obj)s\n")
- % {'obj': short(obj)})
- if sub is not None:
- self.ui.warn(
- _("%(sub)s try to obsolete immutable changeset %(obj)s\n")
- % {'sub': short(sub), 'obj': short(obj)})
- lock = self.lock()
- try:
- meta = {
- 'date': util.makedate(),
- 'user': ui.username(),
- 'reason': 'unknown',
- }
- subs = (sub == nullid) and [] or [sub]
- mid = self.obsstore.create(obj, subs, 0, meta)
- self._clearobsoletecache()
- self._turn_extinct_secret()
- return mid
- finally:
- lock.release()
-
- def addcollapsedobsolete(self, oldnodes, newnode):
- """Mark oldnodes as collapsed into newnode."""
- # Assume oldnodes are all descendants of a single rev
- rootrevs = self.revs('roots(%ln)', oldnodes)
- assert len(rootrevs) == 1, rootrevs
- rootnode = self[rootrevs[0]].node()
- for n in oldnodes:
- self.addobsolete(newnode, n)
-
- def _turn_extinct_secret(self):
- """ensure all extinct changeset are secret"""
- self._clearobsoletecache()
- # this is mainly for safety purpose
- # both pull and push
- query = '(obsolete() - obsolete()::(unstable() - secret())) - secret()'
- expobs = [c.node() for c in repo.set(query)]
- phases.retractboundary(repo, 2, expobs)
-
- ### Disk IO
+ some = True
+ for oldmark in json.loads(data):
+ del oldmark['id'] # dropped for now
+ del oldmark['reason'] # unused until then
+ oldobject = str(oldmark.pop('object'))
+ oldsubjects = [str(s) for s in oldmark.pop('subjects', [])]
+ LOOKUP_ERRORS = (error.RepoLookupError, error.LookupError)
+ if len(oldobject) != 40:
+ try:
+ oldobject = repo[oldobject].node()
+ except LOOKUP_ERRORS:
+ pass
+ if any(len(s) != 40 for s in oldsubjects):
+ try:
+ oldsubjects = [repo[s].node() for s in oldsubjects]
+ except LOOKUP_ERRORS:
+ pass
- def lock(self, *args, **kwargs):
- l = olock(*args, **kwargs)
- if not getattr(l.releasefn, 'obspatched', False):
- oreleasefn = l.releasefn
- def releasefn(*args, **kwargs):
- if 'obsstore' in vars(self) and self.obsstore._new:
- f = self.sopener('obsstore', 'wb', atomictemp=True)
- try:
- self.obsstore.flushmarkers(f)
- f.close()
- except: # re-raises
- f.discard()
- raise
- oreleasefn(*args, **kwargs)
- releasefn.obspatched = True
- l.releasefn = releasefn
- return l
-
-
- ### pull // push support
-
- def pull(self, remote, *args, **kwargs):
- """wrapper around push that push obsolete relation"""
- l = repo.lock()
- try:
- result = opull(remote, *args, **kwargs)
- remoteobs = remote.listkeys('obsolete')
- if 'dump' in remoteobs:
- remoteobs['dump0'] = remoteobs.pop('dump')
- if 'dump0' in remoteobs:
- for key, values in remoteobs.iteritems():
- if key.startswith('dump'):
- data = base85.b85decode(remoteobs['dump0'])
- self.obsstore.mergemarkers(data)
- self._clearobsoletecache()
- self._turn_extinct_secret()
- return result
- finally:
- l.release()
-
- def push(self, remote, *args, **opts):
- """wrapper around pull that pull obsolete relation"""
- self._turn_extinct_secret()
- try:
- result = opush(remote, *args, **opts)
- except util.Abort, ex:
- hint = _("use 'hg stabilize' to get a stable history (or --force to proceed)")
- if (len(ex.args) >= 1
- and ex.args[0].startswith('push includes ')
- and ex.hint is None):
- ex.hint = hint
- raise
- if 'obsolete' in remote.listkeys('namespaces') and self.obsstore:
- data = self.obsstore._writemarkers()
- r = remote.pushkey('obsolete', 'dump0', '',
- base85.b85encode(data))
- if not r:
- self.ui.warn(_('failed to push obsolete markers!\n'))
- self._turn_extinct_secret()
-
- return result
-
-
- ### rollback support
-
- # /!\ api change in Hg 2.2 (97efd26eb9576f39590812ea9) /!\
- if util.safehasattr(repo, '_journalfiles'): # Hg 2.2
- def _journalfiles(self):
- return o_journalfiles() + (self.sjoin('journal.obsstore'),)
-
- def _writejournal(self, desc):
- """wrapped version of _writejournal that save obsolete data"""
- o_writejournal(desc)
- filename = 'obsstore'
- filepath = self.sjoin(filename)
- if os.path.exists(filepath):
- journalname = 'journal.' + filename
- journalpath = self.sjoin(journalname)
- util.copyfile(filepath, journalpath)
-
- else: # XXX removing this bloc will break Hg 2.1 support
- def _writejournal(self, desc):
- """wrapped version of _writejournal that save obsolete data"""
- entries = list(o_writejournal(desc))
- filename = 'obsstore'
- filepath = self.sjoin(filename)
- if os.path.exists(filepath):
- journalname = 'journal.' + filename
- journalpath = self.sjoin(journalname)
- util.copyfile(filepath, journalpath)
- entries.append(journalpath)
- return tuple(entries)
-
- def _rollback(self, dryrun, force):
- """wrapped version of _rollback that restore obsolete data"""
- ret = o_rollback(dryrun, force)
- if not (ret or dryrun): #rollback did not failed
- src = self.sjoin('undo.obsstore')
- dst = self.sjoin('obsstore')
- if os.path.exists(src):
- util.rename(src, dst)
- elif os.path.exists(dst):
- # If no state was saved because the file did not existed before.
- os.unlink(dst)
- # invalidate cache
- self.__dict__.pop('obsstore', None)
- return ret
-
- @storecache('00changelog.i')
- def changelog(self):
- # << copy pasted from mercurial source
- c = changelog.changelog(self.sopener)
- if 'HG_PENDING' in os.environ:
- p = os.environ['HG_PENDING']
- if p.startswith(self.root):
- c.readpending('00changelog.i.a')
- # >> end of the copy paste
- old = c.__dict__.pop('hiddenrevs', ())
- if old:
- ui.warn("old wasn't empty ? %r" % old)
- def _sethidden(c, value):
- assert not value
-
-
- class hchangelog(c.__class__):
- @util.propertycache
- def hiddenrevs(c):
- shown = ['not obsolete()', '.', 'bookmark()', 'tagged()',
- 'public()']
- basicquery = 'obsolete() - (::(%s))' % (' or '.join(shown))
- # !!! self is repo not changelog
- result = set(scmutil.revrange(self, [basicquery]))
- return result
- c.__class__ = hchangelog
- return c
-
- repo.__class__ = obsoletingrepo
+ oldmark['date'] = '%i %i' % tuple(oldmark['date'])
+ meta = dict((k.encode('utf-8'), v.encode('utf-8'))
+ for k, v in oldmark.iteritems())
+ try:
+ succs = [bin(n) for n in oldsubjects]
+ succs = [n for n in succs if n != nullid]
+ store.create(tr, bin(oldobject), succs,
+ 0, meta)
+ cnt += 1
+ except ValueError:
+ repo.ui.write_err("invalid marker %s -> %s\n"
+ % (oldobject, oldsubjects))
+ err += 1
+ unlink.append(repo.sjoin('obsoletemarkers'))
+ tr.close()
+ for path in unlink:
+ util.unlink(path)
+ finally:
+ tr.release()
+ finally:
+ del repo._importoldobsolete
+ l.release()
+ if not some:
+ ui.warn('nothing to do\n')
+ ui.status('%i obsolete marker converted\n' % cnt)
+ if err:
+ ui.write_err('%i conversion failed. check you graph!\n' % err)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hgext/pushexperiment.py Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,112 @@
+"""Small extension altering some push behavior
+
+- Add a new wire protocol command to exchange obsolescence markers. Sending the
+ raw file as a binary instead of using pushkey hack.
+- Add a "push done" notification
+- Push obsolescence marker before anything else (This works around the lack of global transaction)
+
+"""
+
+import errno
+from StringIO import StringIO
+
+from mercurial.i18n import _
+from mercurial import extensions
+from mercurial import wireproto
+from mercurial import obsolete
+from mercurial import localrepo
+
+
+def client_pushobsmarkers(self, obsfile):
+ """wireprotocol peer method"""
+ self.requirecap('_push_experiment_pushobsmarkers_0',
+ _('push obsolete markers faster'))
+ ret, output = self._callpush('push_experiment_pushobsmarkers_0', obsfile)
+ for l in output.splitlines(True):
+ self.ui.status(_('remote: '), l)
+ return ret
+
+
+def srv_pushobsmarkers(repo, proto):
+ """wireprotocol command"""
+ fp = StringIO()
+ proto.redirect()
+ proto.getfile(fp)
+ data = fp.getvalue()
+ fp.close()
+ lock = repo.lock()
+ try:
+ tr = repo.transaction('pushkey: obsolete markers')
+ try:
+ repo.obsstore.mergemarkers(tr, data)
+ tr.close()
+ finally:
+ tr.release()
+ finally:
+ lock.release()
+ return wireproto.pushres(0)
+
+
+def syncpush(orig, repo, remote):
+ """wraper for obsolete.syncpush to use the fast way if possible"""
+ if not (obsolete._enabled and repo.obsstore):
+ return
+ if remote.capable('_push_experiment_pushobsmarkers_0'):
+ return # already pushed before changeset
+ remote.push_experiment_pushobsmarkers_0(obsfp)
+ return
+ return orig(repo, remote)
+
+
+def client_notifypushend(self):
+ """wire peer command to notify a push is done"""
+ self.requirecap('_push_experiment_notifypushend_0', _('hook once push is all done'))
+ return self._call('push_experiment_notifypushend_0')
+
+
+def srv_notifypushend(repo, proto):
+ """wire protocol command to notify a push is done"""
+ proto.redirect()
+ repo.hook('notifypushend')
+ return wireproto.pushres(0)
+
+
+def augmented_push(orig, repo, remote, *args, **kwargs):
+ """push wrapped that call the wire protocol command"""
+ if not remote.canpush():
+ raise util.Abort(_("destination does not support push"))
+ if (obsolete._enabled and repo.obsstore
+ and remote.capable('_push_experiment_pushobsmarkers_0')):
+ # push marker early to limit damage of pushing too early.
+ try:
+ obsfp = repo.sopener('obsstore')
+ except IOError as e:
+ if e.errno != errno.ENOENT:
+ raise
+ else:
+ remote.push_experiment_pushobsmarkers_0(obsfp)
+ ret = orig(repo, remote, *args, **kwargs)
+ if remote.capable('_push_experiment_notifypushend_0'):
+ remote.push_experiment_notifypushend_0()
+ return ret
+
+
+def capabilities(orig, repo, proto):
+ """wrapper to advertise new capability"""
+ caps = orig(repo, proto)
+ if obsolete._enabled:
+ caps += ' _push_experiment_pushobsmarkers_0'
+ caps += ' _push_experiment_notifypushend_0'
+ return caps
+
+
+def extsetup(ui):
+ wireproto.wirepeer.push_experiment_pushobsmarkers_0 = client_pushobsmarkers
+ wireproto.wirepeer.push_experiment_notifypushend_0 = client_notifypushend
+ wireproto.commands['push_experiment_pushobsmarkers_0'] = (srv_pushobsmarkers, '')
+ wireproto.commands['push_experiment_notifypushend_0'] = (srv_notifypushend, '')
+ extensions.wrapfunction(wireproto, 'capabilities', capabilities)
+ extensions.wrapfunction(obsolete, 'syncpush', syncpush)
+ extensions.wrapfunction(localrepo.localrepository, 'push', augmented_push)
+
+
--- a/hgext/qsync.py Thu Aug 23 18:09:45 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,261 +0,0 @@
-"""synchronize patches queues and evolving changesets"""
-
-import re
-from cStringIO import StringIO
-import json
-
-from mercurial.i18n import _
-from mercurial import commands
-from mercurial import patch
-from mercurial import util
-from mercurial.node import nullid, hex, short, bin
-from mercurial import cmdutil
-from mercurial import hg
-from mercurial import scmutil
-from mercurial import error
-from mercurial import extensions
-from mercurial import phases
-
-### old compat code
-#############################
-
-BRANCHNAME="qsubmit2"
-
-### new command
-#############################
-cmdtable = {}
-command = cmdutil.command(cmdtable)
-
-@command('^qsync|sync',
- [
- ('a', 'review-all', False, _('mark all touched patches ready for review (no editor)')),
- ],
- '')
-def cmdsync(ui, repo, **opts):
- '''Export draft changeset as mq patch in a mq patches repository commit.
-
- This command get all changesets in draft phase and create an mq changeset:
-
- * on a "qsubmit2" branch (based on the last changeset)
-
- * one patch per draft changeset
-
- * a series files listing all generated patch
-
- * qsubmitdata holding useful information
-
- It does use obsolete relation to update patches that already existing in the qsubmit2 branch.
-
- Already existing patch which became public, draft or got killed are remove from the mq repo.
-
- Patch name are generated using the summary line for changeset description.
-
- .. warning:: Series files is ordered topologically. So two series with
- interleaved changeset will appear interleaved.
- '''
-
- review = 'edit'
- if opts['review_all']:
- review = 'all'
- mqrepo = repo.mq.qrepo()
- if mqrepo is None:
- raise util.Abort('No patches repository')
-
- try:
- parent = mqrepo[BRANCHNAME]
- except error.RepoLookupError:
- parent = initqsubmit(mqrepo)
- store, data, touched = fillstore(repo, parent)
- if not touched:
- raise util.Abort('Nothing changed')
- files = ['qsubmitdata', 'series'] + touched
- # mark some as ready for review
- message = 'qsubmit commit\n\n'
- review_list = []
- applied_list = []
- if review:
- olddata = get_old_data(parent)
- oldfiles = dict([(name, bin(ctxhex)) for ctxhex, name in olddata])
-
- for patch_name in touched:
- try:
- store.getfile(patch_name)
- review_list.append(patch_name)
- except IOError:
- oldnode = oldfiles[patch_name]
- obsolete = extensions.find('obsolete')
- newnodes = obsolete.newerversion(repo, oldnode)
- if newnodes:
- newnodes = [n for n in newnodes if n and n[0] in repo] # remove killing
- if not newnodes:
- # changeset has been killed (eg. reject)
- pass
- else:
- assert len(newnodes) == 1 # conflict!!!
- newnode = newnodes[0]
- assert len(newnode) == 1 # split unsupported for now
- newnode = list(newnode)[0]
- # XXX unmanaged case where a cs is obsoleted by an unavailable one
- #if newnode.node() not in repo.changelog.nodemap:
- # raise util.Abort('%s is obsoleted by an unknown node %s'% (oldnode, newnode))
- ctx = repo[newnode]
- if ctx.phase() == phases.public:
- # applied
- applied_list.append(patch_name)
- elif ctx.phase() == phases.secret:
- # already exported changeset is now secret
- repo.ui.warn("An already exported changeset is now secret!!!")
- else:
- # draft
- assert False, "Should be exported"
-
- if review:
- if applied_list:
- message += '\n'.join('* applied %s' % x for x in applied_list) + '\n'
- if review_list:
- message += '\n'.join('* %s ready for review' % x for x in review_list) + '\n'
- memctx = patch.makememctx(mqrepo, (parent.node(), nullid),
- message,
- None,
- None,
- parent.branch(), files, store,
- editor=None)
- if review == 'edit':
- memctx._text = cmdutil.commitforceeditor(mqrepo, memctx, [])
- mqrepo.savecommitmessage(memctx.description())
- n = memctx.commit()
- return 0
-
-
-def makename(ctx):
- """create a patch name form a changeset"""
- descsummary = ctx.description().splitlines()[0]
- descsummary = re.sub(r'\s+', '_', descsummary)
- descsummary = re.sub(r'\W+', '', descsummary)
- if len(descsummary) > 45:
- descsummary = descsummary[:42] + '.'
- return '%s-%s.diff' % (ctx.branch().upper(), descsummary)
-
-
-def get_old_data(mqctx):
- """read qsubmit data to fetch previous export data
-
- get old data from the content of an mq commit"""
- try:
- old_data = mqctx['qsubmitdata']
- return json.loads(old_data.data())
- except error.LookupError:
- return []
-
-def get_current_data(repo):
- """Return what would be exported if no previous data exists"""
- data = []
- for ctx in repo.set('draft() - (obsolete() + merge())'):
- name = makename(ctx)
- data.append([ctx.hex(), makename(ctx)])
- merges = repo.revs('draft() and merge()')
- if merges:
- repo.ui.warn('ignoring %i merge\n' % len(merges))
- return data
-
-
-def patchmq(repo, store, olddata, newdata):
- """export the mq patches and return all useful data to be exported"""
- finaldata = []
- touched = set()
- currentdrafts = set(d[0] for d in newdata)
- usednew = set()
- usedold = set()
- obsolete = extensions.find('obsolete')
- for oldhex, oldname in olddata:
- if oldhex in usedold:
- continue # no duplicate
- usedold.add(oldhex)
- oldname = str(oldname)
- oldnode = bin(oldhex)
- newnodes = obsolete.newerversion(repo, oldnode)
- if newnodes:
- newnodes = [n for n in newnodes if n and n[0] in repo] # remove killing
- if len(newnodes) > 1:
- newnodes = [short(nodes[0]) for nodes in newnodes]
- raise util.Abort('%s have more than one newer version: %s'% (oldname, newnodes))
- if newnodes:
- # else, changeset have been killed
- newnode = list(newnodes)[0][0]
- ctx = repo[newnode]
- if ctx.hex() != oldhex and ctx.phase():
- fp = StringIO()
- cmdutil.export(repo, [ctx.rev()], fp=fp)
- data = fp.getvalue()
- store.setfile(oldname, data, (None, None))
- finaldata.append([ctx.hex(), oldname])
- usednew.add(ctx.hex())
- touched.add(oldname)
- continue
- if oldhex in currentdrafts:
- # else changeset is now public or secret
- finaldata.append([oldhex, oldname])
- usednew.add(ctx.hex())
- continue
- touched.add(oldname)
-
- for newhex, newname in newdata:
- if newhex in usednew:
- continue
- newnode = bin(newhex)
- ctx = repo[newnode]
- fp = StringIO()
- cmdutil.export(repo, [ctx.rev()], fp=fp)
- data = fp.getvalue()
- store.setfile(newname, data, (None, None))
- finaldata.append([ctx.hex(), newname])
- touched.add(newname)
- # sort by branchrev number
- finaldata.sort(key=lambda x: sort_key(repo[x[0]]))
- # sort touched too (ease review list)
- stouched = [f[1] for f in finaldata if f[1] in touched]
- stouched += [x for x in touched if x not in stouched]
- return finaldata, stouched
-
-def sort_key(ctx):
- """ctx sort key: (branch, rev)"""
- return (ctx.branch(), ctx.rev())
-
-
-def fillstore(repo, basemqctx):
- """fill store with patch data"""
- olddata = get_old_data(basemqctx)
- newdata = get_current_data(repo)
- store = patch.filestore()
- try:
- data, touched = patchmq(repo, store, olddata, newdata)
- # put all name in the series
- series ='\n'.join(d[1] for d in data) + '\n'
- store.setfile('series', series, (False, False))
-
- # export data to ease futur work
- store.setfile('qsubmitdata', json.dumps(data, indent=True),
- (False, False))
- finally:
- store.close()
- return store, data, touched
-
-
-def initqsubmit(mqrepo):
- """create initial qsubmit branch"""
- store = patch.filestore()
- try:
- files = set()
- store.setfile('DO-NOT-EDIT-THIS-WORKING-COPY-BY-HAND', 'WE WARNED YOU!', (False, False))
- store.setfile('.hgignore', '^status$\n', (False, False))
- memctx = patch.makememctx(mqrepo, (nullid, nullid),
- 'qsubmit init',
- None,
- None,
- BRANCHNAME, ('.hgignore',), store,
- editor=None)
- mqrepo.savecommitmessage(memctx.description())
- n = memctx.commit()
- finally:
- store.close()
- return mqrepo[n]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hgext/simple4server.py Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,325 @@
+'''enable experimental obsolescence feature of Mercurial
+
+OBSOLESCENCE IS AN EXPERIMENTAL FEATURE MAKE SURE YOU UNDERSTOOD THE INVOLVED
+CONCEPT BEFORE USING IT.
+
+/!\ THIS EXTENSION IS INTENDED FOR SERVER SIDE ONLY USAGE /!\
+
+For client side usages it is recommended to use the evolve extension for
+improved user interface.'''
+
+testedwith = '3.0.1'
+buglink = 'https://bitbucket.org/marmoute/mutable-history/issues'
+
+import mercurial.obsolete
+mercurial.obsolete._enabled = True
+
+import struct
+from mercurial import util
+from mercurial import wireproto
+from mercurial import extensions
+from mercurial import obsolete
+from cStringIO import StringIO
+from mercurial import node
+from mercurial.hgweb import hgweb_mod
+from mercurial import bundle2
+from mercurial import localrepo
+from mercurial import exchange
+_pack = struct.pack
+
+gboptslist = gboptsmap = None
+try:
+ from mercurial import obsolete
+ if not obsolete._enabled:
+ obsolete._enabled = True
+ from mercurial import wireproto
+ gboptslist = getattr(wireproto, 'gboptslist', None)
+ gboptsmap = getattr(wireproto, 'gboptsmap', None)
+except (ImportError, AttributeError):
+ raise util.Abort('Your Mercurial is too old for this version of Evolve\n'
+ 'requires version 3.0.1 or above')
+
+# Start of simple4server specific content
+
+from mercurial import pushkey
+
+# specific content also include the wrapping int extsetup
+def _nslist(orig, repo):
+ rep = orig(repo)
+ if not repo.ui.configbool('__temporary__', 'advertiseobsolete', True):
+ rep.pop('obsolete')
+ return rep
+
+# End of simple4server specific content
+
+
+
+# from evolve extension: 1a23c7c52a43
+def srv_pushobsmarkers(repo, proto):
+ """That receives a stream of markers and apply then to the repo"""
+ fp = StringIO()
+ proto.redirect()
+ proto.getfile(fp)
+ data = fp.getvalue()
+ fp.close()
+ lock = repo.lock()
+ try:
+ tr = repo.transaction('pushkey: obsolete markers')
+ try:
+ repo.obsstore.mergemarkers(tr, data)
+ tr.close()
+ finally:
+ tr.release()
+ finally:
+ lock.release()
+ repo.hook('evolve_pushobsmarkers')
+ return wireproto.pushres(0)
+
+# from mercurial.obsolete: 19e9478c1a22
+def _encodemarkersstream(fp, markers):
+ """write a binary version of a set of markers
+
+ Includes the initial version number"""
+ fp.write(_pack('>B', 0))
+ for mark in markers:
+ fp.write(obsolete._encodeonemarker(mark))
+
+# from evolve extension: 1a23c7c52a43
+def _getobsmarkersstream(repo, heads=None, common=None):
+ """Get a binary stream for all markers relevant to `::<heads> - ::<common>`
+ """
+ revset = ''
+ args = []
+ repo = repo.unfiltered()
+ if heads is None:
+ revset = 'all()'
+ elif heads:
+ revset += "(::%ln)"
+ args.append(heads)
+ else:
+ assert False, 'pulling no heads?'
+ if common:
+ revset += ' - (::%ln)'
+ args.append(common)
+ nodes = [c.node() for c in repo.set(revset, *args)]
+ markers = repo.obsstore.relevantmarkers(nodes)
+ obsdata = StringIO()
+ _encodemarkersstream(obsdata, markers)
+ obsdata.seek(0)
+ return obsdata
+
+# from evolve extension: 1a23c7c52a43
+class pruneobsstore(obsolete.obsstore):
+ """And extended obsstore class that read parent information from v1 format
+
+ Evolve extension adds parent information in prune marker. We use it to make
+ markers relevant to pushed changeset."""
+
+ def __init__(self, *args, **kwargs):
+ self.prunedchildren = {}
+ return super(pruneobsstore, self).__init__(*args, **kwargs)
+
+ def _load(self, markers):
+ markers = self._prunedetectingmarkers(markers)
+ return super(pruneobsstore, self)._load(markers)
+
+
+ def _prunedetectingmarkers(self, markers):
+ for m in markers:
+ if not m[1]: # no successors
+ meta = obsolete.decodemeta(m[3])
+ if 'p1' in meta:
+ p1 = node.bin(meta['p1'])
+ self.prunedchildren.setdefault(p1, set()).add(m)
+ if 'p2' in meta:
+ p2 = node.bin(meta['p2'])
+ self.prunedchildren.setdefault(p2, set()).add(m)
+ yield m
+
+# from evolve extension: 1a23c7c52a43
+def relevantmarkers(self, nodes):
+ """return a set of all obsolescence marker relevant to a set of node.
+
+ "relevant" to a set of node mean:
+
+ - marker that use this changeset as successors
+ - prune marker of direct children on this changeset.
+ - recursive application of the two rules on precursors of these markers
+
+ It is a set so you cannot rely on order"""
+ seennodes = set(nodes)
+ seenmarkers = set()
+ pendingnodes = set(nodes)
+ precursorsmarkers = self.precursors
+ prunedchildren = self.prunedchildren
+ while pendingnodes:
+ direct = set()
+ for current in pendingnodes:
+ direct.update(precursorsmarkers.get(current, ()))
+ direct.update(prunedchildren.get(current, ()))
+ direct -= seenmarkers
+ pendingnodes = set([m[0] for m in direct])
+ seenmarkers |= direct
+ pendingnodes -= seennodes
+ seennodes |= pendingnodes
+ return seenmarkers
+
+# from evolve extension: cf35f38d6a10
+def srv_pullobsmarkers(repo, proto, others):
+ """serves a binary stream of markers.
+
+ Serves relevant to changeset between heads and common. The stream is prefix
+ by a -string- representation of an integer. This integer is the size of the
+ stream."""
+ opts = wireproto.options('', ['heads', 'common'], others)
+ for k, v in opts.iteritems():
+ if k in ('heads', 'common'):
+ opts[k] = wireproto.decodelist(v)
+ obsdata = _getobsmarkersstream(repo, **opts)
+ finaldata = StringIO()
+ obsdata = obsdata.getvalue()
+ finaldata.write('%20i' % len(obsdata))
+ finaldata.write(obsdata)
+ finaldata.seek(0)
+ return wireproto.streamres(proto.groupchunks(finaldata))
+
+
+# from evolve extension: 1a23c7c52a43
+def _obsrelsethashtree(repo):
+ """Build an obshash for every node in a repo
+
+ return a [(node), (obshash)] list. in revision order."""
+ cache = []
+ unfi = repo.unfiltered()
+ for i in unfi:
+ ctx = unfi[i]
+ entry = 0
+ sha = util.sha1()
+ # add data from p1
+ for p in ctx.parents():
+ p = p.rev()
+ if p < 0:
+ p = node.nullid
+ else:
+ p = cache[p][1]
+ if p != node.nullid:
+ entry += 1
+ sha.update(p)
+ tmarkers = repo.obsstore.relevantmarkers([ctx.node()])
+ if tmarkers:
+ bmarkers = [obsolete._encodeonemarker(m) for m in tmarkers]
+ bmarkers.sort()
+ for m in bmarkers:
+ entry += 1
+ sha.update(m)
+ if entry:
+ cache.append((ctx.node(), sha.digest()))
+ else:
+ cache.append((ctx.node(), node.nullid))
+ return cache
+
+# from evolve extension: 1a23c7c52a43
+def _obshash(repo, nodes):
+ """hash of binary version of relevant markers + obsparent
+
+ (special case so that all empty are hashed as nullid)"""
+ hashs = _obsrelsethashtree(repo)
+ nm = repo.changelog.nodemap
+ return [hashs[nm.get(n)][1] for n in nodes]
+
+# from evolve extension: 1a23c7c52a43
+def srv_obshash(repo, proto, nodes):
+ """give the obshash of a a set of node
+
+ Used for markes discovery"""
+ return wireproto.encodelist(_obshash(repo, wireproto.decodelist(nodes)))
+
+# from evolve extension: 1a23c7c52a43
+def capabilities(orig, repo, proto):
+ """wrapper to advertise new capability"""
+ caps = orig(repo, proto)
+ advertise = repo.ui.configbool('__temporary__', 'advertiseobsolete', True)
+ if obsolete._enabled and advertise:
+ caps += ' _evoext_pushobsmarkers_0'
+ caps += ' _evoext_pullobsmarkers_0'
+ caps += ' _evoext_obshash_0'
+ caps += ' _evoext_b2x_obsmarkers_0'
+ return caps
+
+
+# from evolve extension: 10867a8e27c6
+# heavily modified
+def extsetup(ui):
+ localrepo.moderncaps.add('_evoext_b2x_obsmarkers_0')
+ if gboptsmap is not None:
+ gboptsmap['evo_obsmarker'] = 'plain'
+ gboptsmap['evo_obscommon'] = 'plain'
+ gboptsmap['evo_obsheads'] = 'plain'
+ else:
+ gboptslist.append('evo_obsheads')
+ gboptslist.append('evo_obscommon')
+ gboptslist.append('evo_obsmarker')
+ obsolete.obsstore = pruneobsstore
+ obsolete.obsstore.relevantmarkers = relevantmarkers
+ hgweb_mod.perms['evoext_pushobsmarkers_0'] = 'push'
+ hgweb_mod.perms['evoext_pullobsmarkers_0'] = 'pull'
+ hgweb_mod.perms['evoext_obshash'] = 'pull'
+ wireproto.commands['evoext_pushobsmarkers_0'] = (srv_pushobsmarkers, '')
+ wireproto.commands['evoext_pullobsmarkers_0'] = (srv_pullobsmarkers, '*')
+ # wrap module content
+ extensions.wrapfunction(exchange, '_getbundleextrapart', _getbundleextrapart)
+ extensions.wrapfunction(wireproto, 'capabilities', capabilities)
+ # wrap command content
+ oldcap, args = wireproto.commands['capabilities']
+ def newcap(repo, proto):
+ return capabilities(oldcap, repo, proto)
+ wireproto.commands['capabilities'] = (newcap, args)
+ wireproto.commands['evoext_obshash'] = (srv_obshash, 'nodes')
+ # specific simple4server content
+ extensions.wrapfunction(pushkey, '_nslist', _nslist)
+ pushkey._namespaces['namespaces'] = (lambda *x: False, pushkey._nslist)
+
+
+#from evolve extension
+@bundle2.parthandler('evolve:b2x:obsmarkerv1')
+def handleobsmarkerv1(op, inpart):
+ """add a stream of obsmarker to the repo"""
+ tr = op.gettransaction()
+ advparams = dict(inpart.advisoryparams)
+ length = advparams.get('totalbytes')
+ if length is None:
+ obsdata = inpart.read()
+ else:
+ length = int(length)
+ data = StringIO()
+ current = 0
+ op.ui.progress('OBSEXC', current, unit="bytes", total=length)
+ while current < length:
+ readsize = min(length-current, 4096)
+ data.write(inpart.read(readsize))
+ current += readsize
+ op.ui.progress('OBSEXC', current, unit="bytes", total=length)
+ op.ui.progress('OBSEXC', None)
+ obsdata = data.getvalue()
+ totalsize = len(obsdata)
+ old = len(op.repo.obsstore._all)
+ op.repo.obsstore.mergemarkers(tr, obsdata)
+ new = len(op.repo.obsstore._all) - old
+ op.records.add('evo_obsmarkers', {'new': new, 'bytes': totalsize})
+ tr.hookargs['evolve_new_obsmarkers'] = str(new)
+
+#from evolve extension
+def _getbundleextrapart(orig, bundler, repo, source, **kwargs):
+ if int(kwargs.pop('evo_obsmarker', False)):
+ common = kwargs.pop('evo_obscommon')
+ common = wireproto.decodelist(common)
+ heads = kwargs.pop('evo_obsheads')
+ heads = wireproto.decodelist(heads)
+ obsdata = _getobsmarkersstream(repo, common=common, heads=heads)
+ if len(obsdata.getvalue()) > 5:
+ advparams = [('totalbytes', str(len(obsdata.getvalue())))]
+ obspart = bundle2.bundlepart('EVOLVE:B2X:OBSMARKERV1',
+ advisoryparams=advparams,
+ data=obsdata)
+ bundler.addpart(obspart)
+ orig(bundler, repo, source)
--- a/qsync-enable.sh Thu Aug 23 18:09:45 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-here=`readlink -f "$0"`
-repo_root=`dirname "$here"`
-
-
-
-cat << EOF >&2
-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-XXX Add lines below to the [extensions] section of you hgrc XXX
-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-
-
-EOF
-
-cat << EOF | sed -e "s#XXXREPOPATHXXX#${repo_root}#"
-[extensions]
-# experimental extensions for mq export
-qsync=XXXREPOPATHXXX/hgext/qsync.py
-EOF
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/setup.py Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,18 @@
+# Copied from histedit setup.py
+# Credit to Augie Fackler <durin42@gmail.com>
+
+from distutils.core import setup
+
+setup(
+ name='hg-evolve',
+ version='4.0.0',
+ author='Pierre-Yves David',
+ maintainer='Pierre-Yves David',
+ maintainer_email='pierre-yves.david@ens-lyon.org',
+ url='https://bitbucket.org/marmoute/mutable-history',
+ description='Flexible evolution of Mercurial history.',
+ long_description=open('README').read(),
+ keywords='hg mercurial',
+ license='GPLv2+',
+ py_modules=['hgext.evolve'],
+)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/_exc-util.sh Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+cat >> $HGRCPATH <<EOF
+[web]
+push_ssl = false
+allow_push = *
+[ui]
+logtemplate ="{node|short} ({phase}): {desc}\n"
+[phases]
+publish=False
+[extensions]
+hgext.strip=
+hgext.rebase=
+EOF
+echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+
+mkcommit() {
+ echo "$1" > "$1"
+ hg add "$1"
+ hg ci -m "$1"
+}
+getid() {
+ hg id --hidden --debug -ir "$1"
+}
+
+setuprepos() {
+ echo creating test repo for test case $1
+ mkdir $1
+ cd $1
+ echo - pulldest
+ hg init pushdest
+ cd pushdest
+ mkcommit O
+ hg phase --public .
+ cd ..
+ echo - main
+ hg clone -q pushdest main
+ echo - pushdest
+ hg clone -q main pulldest
+ echo 'cd into `main` and proceed with env setup'
+}
+
+dotest() {
+# dotest TESTNAME [TARGETNODE]
+
+ testcase=$1
+ shift
+ target="$1"
+ if [ $# -gt 0 ]; then
+ shift
+ fi
+ targetnode=""
+ desccall=""
+ cd $testcase
+ echo "## Running testcase $testcase"
+ if [ -n "$target" ]; then
+ desccall="desc("\'"$target"\'")"
+ targetnode="`hg -R main id -qr \"$desccall\"`"
+ echo "# testing echange of \"$target\" ($targetnode)"
+ fi
+ echo "## initial state"
+ echo "# obstore: main"
+ hg -R main debugobsolete | sort
+ echo "# obstore: pushdest"
+ hg -R pushdest debugobsolete | sort
+ echo "# obstore: pulldest"
+ hg -R pulldest debugobsolete | sort
+
+ if [ -n "$target" ]; then
+ echo "## pushing \"$target\"" from main to pushdest
+ hg -R main push -r "$desccall" $@ pushdest
+ else
+ echo "## pushing from main to pushdest"
+ hg -R main push pushdest $@
+ fi
+ echo "## post push state"
+ echo "# obstore: main"
+ hg -R main debugobsolete | sort
+ echo "# obstore: pushdest"
+ hg -R pushdest debugobsolete | sort
+ echo "# obstore: pulldest"
+ hg -R pulldest debugobsolete | sort
+ if [ -n "$target" ]; then
+ echo "## pulling \"$targetnode\"" from main into pulldest
+ hg -R pulldest pull -r $targetnode $@ main
+ else
+ echo "## pulling from main into pulldest"
+ hg -R pulldest pull main $@
+ fi
+ echo "## post pull state"
+ echo "# obstore: main"
+ hg -R main debugobsolete | sort
+ echo "# obstore: pushdest"
+ hg -R pushdest debugobsolete | sort
+ echo "# obstore: pulldest"
+ hg -R pulldest debugobsolete | sort
+
+ cd ..
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/dummyssh Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+
+import sys
+import os
+
+os.chdir(os.getenv('TESTTMP'))
+
+if sys.argv[1] != "user@dummy":
+ sys.exit(-1)
+
+os.environ["SSH_CLIENT"] = "127.0.0.1 1 2"
+
+log = open("dummylog", "ab")
+log.write("Got arguments")
+for i, arg in enumerate(sys.argv[1:]):
+ log.write(" %d:%s" % (i + 1, arg))
+log.write("\n")
+log.close()
+hgcmd = sys.argv[2]
+if os.name == 'nt':
+ # hack to make simple unix single quote quoting work on windows
+ hgcmd = hgcmd.replace("'", '"')
+r = os.system(hgcmd)
+sys.exit(bool(r))
--- a/tests/run-tests.py Thu Aug 23 18:09:45 2012 +0200
+++ b/tests/run-tests.py Thu Jun 26 15:27:25 2014 +0100
@@ -74,7 +74,7 @@
if 'java' in sys.platform:
IMPL_PATH = 'JYTHONPATH'
-requiredtools = ["python", "diff", "grep", "unzip", "gunzip", "bunzip2", "sed"]
+requiredtools = ["python", "diff", "grep", "sed"]
defaults = {
'jobs': ('HGTEST_JOBS', 1),
--- a/tests/test-amend.t Thu Aug 23 18:09:45 2012 +0200
+++ b/tests/test-amend.t Thu Jun 26 15:27:25 2014 +0100
@@ -5,14 +5,13 @@
> hgext.rebase=
> hgext.graphlog=
> EOF
- $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
$ glog() {
> hg glog --template '{rev}@{branch}({phase}) {desc|firstline}\n' "$@"
> }
- $ hg init repo
+ $ hg init repo --traceback
$ cd repo
$ echo a > a
$ hg ci -Am adda
@@ -24,22 +23,21 @@
marked working directory as branch foo
(branches are permanent and global, did you want a bookmark?)
$ hg amend
- $ hg debugsuccessors
- 07f494440405 a34b93d251e4
- bd19cbe78fbf a34b93d251e4
+ $ hg debugobsolete
+ 07f4944404050f47db2e5c5071e0e84e7a27bba9 6a022cbb61d5ba0f03f98ff2d36319dfea1034ae 0 {'date': '* *', 'user': 'test'} (glob)
+ b2e32ffb533cbe1d5759638c0cd4e8abc43b2738 0 {'date': '* *', 'user': 'test'} (glob)
$ hg branch
foo
$ hg branches
- foo 2:a34b93d251e4
- default 0:07f494440405 (inactive)
+ foo 2:6a022cbb61d5
$ glog
@ 2@foo(draft) adda
Test no-op
$ hg amend
- abort: no updates found
- [255]
+ nothing changed
+ [1]
$ glog
@ 2@foo(draft) adda
@@ -47,8 +45,8 @@
Test forcing the message to the same value, no intermediate revision.
$ hg amend -m 'adda'
- abort: no updates found
- [255]
+ nothing changed
+ [1]
$ glog
@ 2@foo(draft) adda
@@ -58,13 +56,21 @@
$ echo a >> a
$ hg ci -m changea
$ echo a > a
+ $ hg status
+ M a
+ $ hg pstatus
+ $ hg diff
+ diff -r f7a50201fe3a a
+ --- a/a Thu Jan 01 00:00:00 1970 +0000
+ +++ b/a * +0000 (glob)
+ @@ -1,2 +1,1 @@
+ a
+ -a
+ $ hg pdiff
$ hg ci -m reseta
- $ hg amend --change 2
- abort: no updates found
- [255]
- $ hg debugsuccessors
- 07f494440405 a34b93d251e4
- bd19cbe78fbf a34b93d251e4
+ $ hg debugobsolete
+ 07f4944404050f47db2e5c5071e0e84e7a27bba9 6a022cbb61d5ba0f03f98ff2d36319dfea1034ae 0 {'date': '* *', 'user': 'test'} (glob)
+ b2e32ffb533cbe1d5759638c0cd4e8abc43b2738 0 {'date': '* *', 'user': 'test'} (glob)
$ hg phase 2
2: draft
$ glog
@@ -75,31 +81,3 @@
o 2@foo(draft) adda
-Test collapsing into an existing rev, with an intermediate revision.
-
- $ hg branch --force default
- marked working directory as branch default
- (branches are permanent and global, did you want a bookmark?)
- $ hg ci -m resetbranch
- created new head
- $ hg branch --force foo
- marked working directory as branch foo
- (branches are permanent and global, did you want a bookmark?)
- $ hg amend --change 2
- abort: no updates found
- [255]
- $ hg debugsuccessors
- 07f494440405 a34b93d251e4
- 7384bbcba36f 000000000000
- bd19cbe78fbf a34b93d251e4
- $ glog
- @ 6@foo(secret) amends a34b93d251e49c93d5685ebacad785c73a7e8605
- |
- o 5@default(draft) resetbranch
- |
- o 4@foo(draft) reseta
- |
- o 3@foo(draft) changea
- |
- o 2@foo(draft) adda
-
--- a/tests/test-corrupt.t Thu Aug 23 18:09:45 2012 +0200
+++ b/tests/test-corrupt.t Thu Jun 26 15:27:25 2014 +0100
@@ -16,7 +16,6 @@
> hgext.rebase=
> hgext.graphlog=
> EOF
- $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
$ mkcommit() {
> echo "$1" >> "$1"
@@ -104,6 +103,7 @@
$ hg kill -n -1 -- -2 -3
+ 2 changesets pruned
$ hg push ../other
pushing to ../other
searching for changes
@@ -111,6 +111,10 @@
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 4 nodes
+ OBSEXC: pushing 2 markers (147 bytes)
+ OBSEXC: DONE
$ hg -R ../other verify
checking changesets
checking manifests
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-drop.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,267 @@
+
+ $ cat >> $HGRCPATH <<EOF
+ > [extensions]
+ > hgext.rebase=
+ > hgext.graphlog=
+ > EOF
+ $ echo "drophack=$(echo $(dirname $TESTDIR))/hgext/drophack.py" >> $HGRCPATH
+ $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+ $ mkcommit() {
+ > echo "$1" > "$1"
+ > hg add "$1"
+ > hg ci -m "add $1"
+ > }
+ $ summary() {
+ > echo ============ graph ==============
+ > hg log -G
+ > echo ============ hidden =============
+ > hg log --hidden -G
+ > echo ============ obsmark ============
+ > hg debugobsolete
+ > }
+
+
+ $ hg init repo
+ $ cd repo
+ $ mkcommit base
+
+drop a single changeset without any rewrite
+================================================
+
+
+ $ mkcommit simple-single
+ $ summary
+ ============ graph ==============
+ @ changeset: 1:d4e7845543ff
+ | tag: tip
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: add simple-single
+ |
+ o changeset: 0:b4952fcf48cf
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: add base
+
+ ============ hidden =============
+ @ changeset: 1:d4e7845543ff
+ | tag: tip
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: add simple-single
+ |
+ o changeset: 0:b4952fcf48cf
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: add base
+
+ ============ obsmark ============
+ $ hg drop .
+ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ working directory now at b4952fcf48cf
+ search obsmarker: wall * comb * user * sys * (glob)
+ 0 obsmarkers found
+ search nodes: wall * comb * user * sys * (glob)
+ 1 nodes found
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/d4e7845543ff-drophack.hg
+ strip nodes: wall * comb * user * sys * (glob)
+ $ summary
+ ============ graph ==============
+ @ changeset: 0:b4952fcf48cf
+ tag: tip
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: add base
+
+ ============ hidden =============
+ @ changeset: 0:b4952fcf48cf
+ tag: tip
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: add base
+
+ ============ obsmark ============
+
+Try to drop a changeset with children
+================================================
+
+ $ mkcommit parent
+ $ mkcommit child
+ $ summary
+ ============ graph ==============
+ @ changeset: 2:34b6c051bf1f
+ | tag: tip
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: add child
+ |
+ o changeset: 1:19509a42b0d0
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: add parent
+ |
+ o changeset: 0:b4952fcf48cf
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: add base
+
+ ============ hidden =============
+ @ changeset: 2:34b6c051bf1f
+ | tag: tip
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: add child
+ |
+ o changeset: 1:19509a42b0d0
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: add parent
+ |
+ o changeset: 0:b4952fcf48cf
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: add base
+
+ ============ obsmark ============
+ $ hg drop 1
+ cannot drop revision with children (no-eol)
+ [1]
+ $ summary
+ ============ graph ==============
+ @ changeset: 2:34b6c051bf1f
+ | tag: tip
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: add child
+ |
+ o changeset: 1:19509a42b0d0
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: add parent
+ |
+ o changeset: 0:b4952fcf48cf
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: add base
+
+ ============ hidden =============
+ @ changeset: 2:34b6c051bf1f
+ | tag: tip
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: add child
+ |
+ o changeset: 1:19509a42b0d0
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: add parent
+ |
+ o changeset: 0:b4952fcf48cf
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: add base
+
+ ============ obsmark ============
+
+Try to drop a public changeset
+================================================
+
+ $ hg phase --public 2
+ $ hg drop 2
+ cannot drop public revision (no-eol)
+ [1]
+
+
+Try to drop a changeset with rewrite
+================================================
+
+ $ hg phase --force --draft 2
+ $ echo babar >> child
+ $ hg commit --amend
+ $ summary
+ ============ graph ==============
+ @ changeset: 4:a2c06c884bfe
+ | tag: tip
+ | parent: 1:19509a42b0d0
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: add child
+ |
+ o changeset: 1:19509a42b0d0
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: add parent
+ |
+ o changeset: 0:b4952fcf48cf
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: add base
+
+ ============ hidden =============
+ @ changeset: 4:a2c06c884bfe
+ | tag: tip
+ | parent: 1:19509a42b0d0
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: add child
+ |
+ | x changeset: 3:87ea30a976fd
+ | | user: test
+ | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | summary: temporary amend commit for 34b6c051bf1f
+ | |
+ | x changeset: 2:34b6c051bf1f
+ |/ user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: add child
+ |
+ o changeset: 1:19509a42b0d0
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: add parent
+ |
+ o changeset: 0:b4952fcf48cf
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: add base
+
+ ============ obsmark ============
+ 34b6c051bf1f78db6aef400776de5cb964470207 a2c06c884bfe53d3840026248bd8a7eafa152df8 0 {'date': '* *', 'user': 'test'} (glob)
+ 87ea30a976fdf235bf096f04899cb02a903873e2 0 {'date': '* *', 'user': 'test'} (glob)
+ $ hg drop .
+ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ working directory now at 19509a42b0d0
+ search obsmarker: wall * comb * user * sys * (glob)
+ 1 obsmarkers found
+ search nodes: wall * comb * user * sys * (glob)
+ 2 nodes found
+ strip obsmarker: wall * comb * user * sys * (glob)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-drophack.hg (glob)
+ strip nodes: wall * comb * user * sys * (glob)
+ $ summary
+ ============ graph ==============
+ @ changeset: 1:19509a42b0d0
+ | tag: tip
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: add parent
+ |
+ o changeset: 0:b4952fcf48cf
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: add base
+
+ ============ hidden =============
+ @ changeset: 1:19509a42b0d0
+ | tag: tip
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: add parent
+ |
+ o changeset: 0:b4952fcf48cf
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: add base
+
+ ============ obsmark ============
+ 87ea30a976fdf235bf096f04899cb02a903873e2 0 {'date': '* *', 'user': 'test'} (glob)
--- a/tests/test-evolve.t Thu Aug 23 18:09:45 2012 +0200
+++ b/tests/test-evolve.t Thu Jun 26 15:27:25 2014 +0100
@@ -1,6 +1,7 @@
$ cat >> $HGRCPATH <<EOF
> [defaults]
> amend=-d "0 0"
+ > fold=-d "0 0"
> [web]
> push_ssl = false
> allow_push = *
@@ -15,7 +16,6 @@
> hgext.rebase=
> hgext.graphlog=
> EOF
- $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
$ mkcommit() {
> echo "$1" > "$1"
@@ -59,7 +59,9 @@
$ hg log -r 1 --template '{rev} {phase} {obsolete}\n'
1 public stable
$ hg kill 1
- cannot kill immutable changeset 7c3bad9141dc
+ abort: cannot prune immutable changeset: 7c3bad9141dc
+ (see "hg help phases" for details)
+ [255]
$ hg log -r 1 --template '{rev} {phase} {obsolete}\n'
1 public stable
@@ -68,6 +70,7 @@
$ hg id -n
5
$ hg kill .
+ 1 changesets pruned
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at fbb94e3a0ecf
$ hg qlog
@@ -79,7 +82,8 @@
test multiple kill
- $ hg kill 4 3
+ $ hg kill 4 -r 3
+ 2 changesets pruned
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 7c3bad9141dc
$ hg qlog
@@ -94,6 +98,7 @@
$ echo 4 > g
$ hg add g
$ hg kill .
+ 1 changesets pruned
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 7c3bad9141dc
$ hg st
@@ -211,11 +216,7 @@
and **amend**::
- $ hg amend --note "fix spelling of Zwei"
-
-The `--note` is our commit message for the *update* only. So its only purpose
-is to document the evolution of the changeset. If we use `--message` with
-`amend`, it replaces the commit message of the changeset itself.
+ $ hg amend
This results in a new single changeset for our amended changeset, and the old
changeset plus the updating changeset are hidden from view by default::
@@ -233,19 +234,12 @@
$ hg phase --public 0 -v
phase changed for 1 changesets
- $ hg amend -c 2
- abort: cannot amend non ancestor changeset
- [255]
(amend of on ancestors)
- $ hg amend -c 2
- abort: cannot amend non ancestor changeset
- [255]
-
- $ hg amend --note 'french looks better'
- 1 new unstables changesets
+ $ hg amend
+ 1 new unstable changesets
$ hg log
6 feature-A: a nifty feature - test
4 feature-B: another feature - test
@@ -253,26 +247,26 @@
0 : base - test
$ hg up -q 0
$ glog --hidden
- o 6:23409eba69a0@default(draft) a nifty feature
+ o 6:ba0ec09b1bab@default(draft) a nifty feature
|
- | o 5:e416e48b2742@default(secret) french looks better
+ | x 5:c296b79833d1@default(draft) temporary amend commit for 568a468b60fc
| |
- | | o 4:f8111a076f09@default(draft) another feature
+ | | o 4:207cbc4ea7fe@default(draft) another feature
| |/
- | | o 3:524e478d4811@default(secret) fix spelling of Zwei
+ | | x 3:5bb880fc0f12@default(draft) temporary amend commit for 7b36850622b2
| | |
- | | o 2:7b36850622b2@default(secret) another feature
+ | | x 2:7b36850622b2@default(draft) another feature
| |/
- | o 1:568a468b60fc@default(draft) a nifty feature
+ | x 1:568a468b60fc@default(draft) a nifty feature
|/
@ 0:e55e0562ee93@default(public) base
- $ hg debugsuccessors
- 524e478d4811 f8111a076f09
- 568a468b60fc 23409eba69a0
- 7b36850622b2 f8111a076f09
- e416e48b2742 23409eba69a0
- $ hg stabilize
+ $ hg debugobsolete
+ 7b36850622b2fd159fa30a4fb2a1edd2043b4a14 207cbc4ea7fee30d18b3a25f534fe5db22c6071b 0 {'date': '* *', 'user': 'test'} (glob)
+ 5bb880fc0f12dd61eee6de36f62b93fdbc3684b0 0 {'date': '* *', 'user': 'test'} (glob)
+ 568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 {'date': '* *', 'user': 'test'} (glob)
+ c296b79833d1d497f33144786174bf35e04e44a3 0 {'date': '* *', 'user': 'test'} (glob)
+ $ hg evolve
move:[4] another feature
atop:[6] a nifty feature
merging main-file-1
@@ -296,10 +290,77 @@
6 feature-A: a nifty feature - test
0 : base - test
-phase change turning obsolete changeset public issue a latecomer warning
+phase change turning obsolete changeset public issue a bumped warning
+
+ $ hg phase --hidden --public 7
+ 1 new bumped changesets
+
+all solving bumped troubled
- $ hg phase --public 7
- 1 new latecomers changesets
+ $ hg glog
+ @ 8 feature-B: another feature that rox - test
+ |
+ | o 7 : another feature - test
+ |/
+ o 6 feature-A: a nifty feature - test
+ |
+ o 0 : base - test
+
+ $ hg evolve --any --traceback
+ recreate:[8] another feature that rox
+ atop:[7] another feature
+ computing new diff
+ committed as ca3b75e3e59b
+ $ hg glog
+ @ 9 feature-B: bumped update to abe98aeaaa35: - test
+ |
+ o 7 : another feature - test
+ |
+ o 6 feature-A: a nifty feature - test
+ |
+ o 0 : base - test
+
+ $ hg diff --hidden -r 9 -r 8
+ $ hg diff -r 9^ -r 9
+ diff --git a/main-file-1 b/main-file-1
+ --- a/main-file-1
+ +++ b/main-file-1
+ @@ -3,1 +3,1 @@
+ -Zwei
+ +deux
+ $ hg log -r 'bumped()' # no more bumped
+
+test evolve --all
+ $ sed -i'' -e s/deux/to/ main-file-1
+ $ hg commit -m 'dansk 2!'
+ $ sed -i'' -e s/Three/tre/ main-file-1
+ $ hg commit -m 'dansk 3!'
+ $ hg update 9
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ sed -i'' -e s/Un/Én/ main-file-1
+ $ hg commit --amend -m 'dansk!'
+ 2 new unstable changesets
+
+ $ hg evolve --all --traceback
+ move:[10] dansk 2!
+ atop:[13] dansk!
+ merging main-file-1
+ move:[11] dansk 3!
+ atop:[14] dansk 2!
+ merging main-file-1
+ $ hg glog
+ @ 15 : dansk 3! - test
+ |
+ o 14 : dansk 2! - test
+ |
+ o 13 feature-B: dansk! - test
+ |
+ o 7 : another feature - test
+ |
+ o 6 feature-A: a nifty feature - test
+ |
+ o 0 : base - test
+
$ cd ..
@@ -324,6 +385,9 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ OBSEXC: pull obsolescence markers
+ OBSEXC: no unknown remote markers
+ OBSEXC: DONE
$ cd alpha
$ cat << EOF > A
@@ -358,6 +422,9 @@
checking files
3 files, 4 changesets, 4 total revisions
$ hg --config extensions.hgext.mq= strip 'extinct()'
+ abort: empty revision set
+ [255]
+ $ hg --config extensions.hgext.mq= strip --hidden 'extinct()'
saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-backup.hg
$ hg verify
checking changesets
@@ -377,6 +444,10 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (171 bytes)
+ OBSEXC: 2 markers added
+ OBSEXC: DONE
(run 'hg update' to get a working copy)
$ hg up
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -405,9 +476,9 @@
|/
o 0:8685c6d34325@default(draft) add 0
- $ hg graft 3 -O
+ $ hg graft -r3 -O
grafting revision 3
- $ hg graft 1 -o 2
+ $ hg graft -r1 -o 2
grafting revision 1
$ glog --hidden
@ 6:acb28cd497b7@default(draft) add 1
@@ -416,17 +487,17 @@
|
o 4:ce341209337f@default(draft) add 4
|
- | o 3:0e84df4912da@default(secret) add 3
+ | x 3:0e84df4912da@default(draft) add 3
| |
- | o 2:db038628b9e5@default(secret) add 2
+ | x 2:db038628b9e5@default(draft) add 2
| |
| o 1:73d38bb17fd7@default(draft) add 1
|/
o 0:8685c6d34325@default(draft) add 0
- $ hg debugsuccessors
- 0e84df4912da 0b9e50c35132
- db038628b9e5 acb28cd497b7
+ $ hg debugobsolete
+ 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 {'date': '* *', 'user': 'test'} (glob)
+ db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 {'date': '* *', 'user': 'test'} (glob)
Test graft --continue
@@ -452,7 +523,7 @@
$ glog --hidden
@ 8:920e58bb443b@default(draft) conflict
|
- | o 7:a5bfd90a2f29@default(secret) conflict
+ | x 7:a5bfd90a2f29@default(draft) conflict
| |
o | 6:acb28cd497b7@default(draft) add 1
| |
@@ -460,18 +531,213 @@
| |
o | 4:ce341209337f@default(draft) add 4
|/
- | o 3:0e84df4912da@default(secret) add 3
+ | x 3:0e84df4912da@default(draft) add 3
| |
- | o 2:db038628b9e5@default(secret) add 2
+ | x 2:db038628b9e5@default(draft) add 2
| |
| o 1:73d38bb17fd7@default(draft) add 1
|/
o 0:8685c6d34325@default(draft) add 0
- $ hg debugsuccessors
- 0e84df4912da 0b9e50c35132
- a5bfd90a2f29 920e58bb443b
- db038628b9e5 acb28cd497b7
+ $ hg debugobsolete
+ 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 {'date': '* *', 'user': 'test'} (glob)
+ db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 {'date': '* *', 'user': 'test'} (glob)
+ a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 920e58bb443b73eea9d6d65570b4241051ea3229 0 {'date': '* *', 'user': 'test'} (glob)
+
+Test touch
+
+ $ glog
+ @ 8:920e58bb443b@default(draft) conflict
+ |
+ o 6:acb28cd497b7@default(draft) add 1
+ |
+ o 5:0b9e50c35132@default(draft) add 3
+ |
+ o 4:ce341209337f@default(draft) add 4
+ |
+ | o 1:73d38bb17fd7@default(draft) add 1
+ |/
+ o 0:8685c6d34325@default(draft) add 0
+
+ $ hg touch
+ $ glog
+ @ 9:*@default(draft) conflict (glob)
+ |
+ o 6:acb28cd497b7@default(draft) add 1
+ |
+ o 5:0b9e50c35132@default(draft) add 3
+ |
+ o 4:ce341209337f@default(draft) add 4
+ |
+ | o 1:73d38bb17fd7@default(draft) add 1
+ |/
+ o 0:8685c6d34325@default(draft) add 0
+
+ $ hg touch .
+ $ glog
+ @ 10:*@default(draft) conflict (glob)
+ |
+ o 6:acb28cd497b7@default(draft) add 1
+ |
+ o 5:0b9e50c35132@default(draft) add 3
+ |
+ o 4:ce341209337f@default(draft) add 4
+ |
+ | o 1:73d38bb17fd7@default(draft) add 1
+ |/
+ o 0:8685c6d34325@default(draft) add 0
+
+
+Test fold
+
+ $ rm *.orig
+ $ hg fold
+ no revision to fold
+ [1]
+ $ hg fold 6 --rev 10
+ abort: cannot specify both --rev and a target revision
+ [255]
+ $ hg fold 6 # want to run hg fold 6
+ 2 changesets folded
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ glog
+ @ 11:dd4682c1a481@default(draft) add 1
+ |
+ o 5:0b9e50c35132@default(draft) add 3
+ |
+ o 4:ce341209337f@default(draft) add 4
+ |
+ | o 1:73d38bb17fd7@default(draft) add 1
+ |/
+ o 0:8685c6d34325@default(draft) add 0
+
+ $ hg log -r 11 --template '{desc}\n'
+ add 1
+
+
+ conflict
+ $ hg debugrebuildstate
+ $ hg st
+
+Test fold with wc parent is not the head of the folded revision
- $ cd ..
+ $ hg up 4
+ 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
+ $ hg fold --rev 4::11 --user victor
+ 3 changesets folded
+ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ glog
+ @ 12:d26d339c513f@default(draft) add 4
+ |
+ | o 1:73d38bb17fd7@default(draft) add 1
+ |/
+ o 0:8685c6d34325@default(draft) add 0
+
+ $ hg log --template '{rev}: {author}\n'
+ 12: victor
+ 1: test
+ 0: test
+ $ hg log -r 12 --template '{desc}\n'
+ add 4
+
+
+ add 3
+
+
+ add 1
+
+
+ conflict
+ $ hg debugrebuildstate
+ $ hg st
+
+Test olog
+
+ $ hg olog
+ 4 : add 4 - test
+ 5 : add 3 - test
+ 11 : add 1 - test
+
+Test obsstore stat
+ $ hg debugobsstorestat
+ markers total: 10
+ for known precursors: 10
+ with parents data: 0
+ markers with no successors: 0
+ 1 successors: 10
+ 2 successors: 0
+ more than 2 successors: 0
+ average meta length: 27
+ available keys:
+ date: 10
+ user: 10
+ disconnected clusters: 1
+ any known node: 1
+ smallest length: 10
+ longer length: 10
+ median length: 10
+ mean length: 10
+ using parents data: 1
+ any known node: 1
+ smallest length: 10
+ longer length: 10
+ median length: 10
+ mean length: 10
+
+
+Test evolving renames
+
+ $ hg up null
+ 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
+ $ echo a > a
+ $ hg ci -Am a
+ adding a
+ created new head
+ $ echo b > b
+ $ hg ci -Am b
+ adding b
+ $ hg mv a c
+ $ hg ci -m c
+ $ hg kill .^
+ 1 changesets pruned
+ 1 new unstable changesets
+ $ hg stab --any
+ move:[15] c
+ atop:[13] a
+ $ hg st -C --change=tip
+ A c
+ a
+ R a
+
+Test fold with commit messages
+
+ $ cd ../work
+ $ hg fold .^ --message "Folding with custom commit message"
+ 2 changesets folded
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ glog
+ @ 16:e6d8dace77a1@default(draft) Folding with custom commit message
+ |
+ o 13:e9c952d5bc4b@default(draft) dansk!
+ |
+ o 7:abe98aeaaa35@default(public) another feature
+ |
+ o 6:ba0ec09b1bab@default(public) a nifty feature
+ |
+ o 0:e55e0562ee93@default(public) base
+
+ $ cat > commit-message <<EOF
+ > A longer
+ > commit message
+ > EOF
+
+ $ hg fold .^ --logfile commit-message
+ 2 changesets folded
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg qlog
+ 17 - 2451d817c756 A longer
+ commit message (draft)
+ 7 - abe98aeaaa35 another feature (public)
+ 6 - ba0ec09b1bab a nifty feature (public)
+ 0 - e55e0562ee93 base (public)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-exchange-A1.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,309 @@
+
+Initial setup
+
+ $ . $TESTDIR/_exc-util.sh
+
+==== A.1.1 pushing a single head ====
+..
+.. {{{
+.. ⇠◔ A
+.. |
+.. ● O
+.. }}}
+..
+.. Marker exist from:
+..
+.. * A
+..
+.. Command run:
+..
+.. * hg push -r A
+.. * hg push
+..
+.. Expected exchange:
+..
+.. * chain from A
+
+Setup
+---------------
+
+initial
+
+ $ setuprepos A.1.1
+ creating test repo for test case A.1.1
+ - pulldest
+ - main
+ - pushdest
+ cd into `main` and proceed with env setup
+ $ cd main
+ $ mkcommit A
+ $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'`
+ $ hg log -G
+ @ f5bc6836db60 (draft): A
+ |
+ o a9bdc8b26820 (public): O
+
+ $ hg debugobsolete
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ $ cd ..
+ $ cd ..
+
+setup both variants
+
+ $ cp -r A.1.1 A.1.1.a
+ $ cp -r A.1.1 A.1.1.b
+
+
+Variante a: push -r A
+---------------------
+
+ $ dotest A.1.1.a A
+ ## Running testcase A.1.1.a
+ # testing echange of "A" (f5bc6836db60)
+ ## initial state
+ # obstore: main
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing "A" from main to pushdest
+ pushing to pushdest
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 2 nodes
+ OBSEXC: pushing 1 markers (62 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling "f5bc6836db60" from main into pulldest
+ pulling from main
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (62 bytes)
+ OBSEXC: 1 markers added
+ OBSEXC: DONE
+ (run 'hg update' to get a working copy)
+ ## post pull state
+ # obstore: main
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+
+
+
+
+Variante b: push
+---------------------
+
+ $ dotest A.1.1.b
+ ## Running testcase A.1.1.b
+ ## initial state
+ # obstore: main
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing from main to pushdest
+ pushing to pushdest
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 2 nodes
+ OBSEXC: pushing 1 markers (62 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling from main into pulldest
+ pulling from main
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (62 bytes)
+ OBSEXC: 1 markers added
+ OBSEXC: DONE
+ (run 'hg update' to get a working copy)
+ ## post pull state
+ # obstore: main
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+
+
+
+
+
+
+==== A.1.2 pushing a multiple changeset into a single head ====
+
+.. {{{
+.. ◔ B
+.. |
+.. ⇠◔ A
+.. |
+.. ● O
+.. }}}
+..
+.. Marker exist from:
+..
+.. * A
+..
+.. Command run:
+..
+.. * hg push -r B
+.. * hg push
+..
+.. Expected exchange:
+..
+.. * chain from A
+
+Setup
+---------------
+
+initial
+
+ $ setuprepos A.1.2
+ creating test repo for test case A.1.2
+ - pulldest
+ - main
+ - pushdest
+ cd into `main` and proceed with env setup
+ $ cd main
+ $ mkcommit A
+ $ mkcommit B
+ $ hg log -G
+ @ f6fbb35d8ac9 (draft): B
+ |
+ o f5bc6836db60 (draft): A
+ |
+ o a9bdc8b26820 (public): O
+
+ $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'`
+ $ hg debugobsolete
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ $ cd ..
+ $ cd ..
+
+setup both variants
+
+ $ cp -r A.1.2 A.1.2.a
+ $ cp -r A.1.2 A.1.2.b
+
+
+Variante a: push -r A
+---------------------
+
+ $ dotest A.1.2.a B
+ ## Running testcase A.1.2.a
+ # testing echange of "B" (f6fbb35d8ac9)
+ ## initial state
+ # obstore: main
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing "B" from main to pushdest
+ pushing to pushdest
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 2 changesets with 2 changes to 2 files
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 3 nodes
+ OBSEXC: pushing 1 markers (62 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling "f6fbb35d8ac9" from main into pulldest
+ pulling from main
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 2 changesets with 2 changes to 2 files
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (62 bytes)
+ OBSEXC: 1 markers added
+ OBSEXC: DONE
+ (run 'hg update' to get a working copy)
+ ## post pull state
+ # obstore: main
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+
+Variante b: push
+---------------------
+
+ $ dotest A.1.2.b
+ ## Running testcase A.1.2.b
+ ## initial state
+ # obstore: main
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing from main to pushdest
+ pushing to pushdest
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 2 changesets with 2 changes to 2 files
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 3 nodes
+ OBSEXC: pushing 1 markers (62 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling from main into pulldest
+ pulling from main
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 2 changesets with 2 changes to 2 files
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (62 bytes)
+ OBSEXC: 1 markers added
+ OBSEXC: DONE
+ (run 'hg update' to get a working copy)
+ ## post pull state
+ # obstore: main
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-exchange-A2.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,116 @@
+
+
+Initial setup
+
+ $ . $TESTDIR/_exc-util.sh
+
+=== A.2 Two heads ===
+
+.. {{{
+.. ⇠○ B
+.. ⇠◔ | A
+.. |/
+.. ● O
+.. }}}
+..
+.. Marker exist from:
+..
+.. * A
+.. * B
+..
+..
+.. Command run:
+..
+.. * hg push -r A
+..
+.. Expected exchange:
+..
+.. * chain from A
+..
+.. Expected Exclude:
+..
+.. * chain from B
+
+initial
+
+ $ setuprepos A.2
+ creating test repo for test case A.2
+ - pulldest
+ - main
+ - pushdest
+ cd into `main` and proceed with env setup
+ $ cd main
+ $ mkcommit A
+ $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'`
+ $ hg up .^
+ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ $ mkcommit B
+ created new head
+ $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(B)'`
+ $ hg log -G
+ @ 35b183996678 (draft): B
+ |
+ | o f5bc6836db60 (draft): A
+ |/
+ o a9bdc8b26820 (public): O
+
+ $ hg debugobsolete
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 {'date': '', 'user': 'test'}
+ $ cd ..
+ $ cd ..
+
+
+Actual Test
+---------------
+
+ $ dotest A.2 A
+ ## Running testcase A.2
+ # testing echange of "A" (f5bc6836db60)
+ ## initial state
+ # obstore: main
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing "A" from main to pushdest
+ pushing to pushdest
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 2 nodes
+ OBSEXC: pushing 1 markers (62 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling "f5bc6836db60" from main into pulldest
+ pulling from main
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (62 bytes)
+ OBSEXC: 1 markers added
+ OBSEXC: DONE
+ (run 'hg update' to get a working copy)
+ ## post pull state
+ # obstore: main
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+
+
+ $ cd ..
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-exchange-A3.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,230 @@
+
+Initial setup
+
+ $ . $TESTDIR/_exc-util.sh
+
+=== A.3 new branch created ===
+
+.. {{{
+.. B' ○⇢ø B
+.. | |
+.. \Aø⇠◔ A'
+.. \|/
+.. ● O
+.. }}}
+..
+.. Marker exist from:
+..
+.. * `Aø⇠○ A'`
+.. * `Bø⇠○ B'`
+..
+.. Command run:
+..
+.. * hg push -r A
+..
+.. Expected exchange:
+..
+.. * chain from A
+..
+.. Expected Exclude:
+..
+.. * chain from B
+..
+.. Extra note:
+..
+.. If A and B are remontly known, we should expect:
+..
+.. * `hg push` will complain about the new head
+.. * `hg push` should complain about unstable history creation
+
+initial
+
+ $ setuprepos A.3.a
+ creating test repo for test case A.3.a
+ - pulldest
+ - main
+ - pushdest
+ cd into `main` and proceed with env setup
+ $ cd main
+ $ mkcommit A0
+ $ mkcommit B0
+ $ hg update -q 0
+ $ mkcommit A1
+ created new head
+ $ hg update -q 0
+ $ mkcommit B1
+ created new head
+ $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
+ $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
+ $ hg log -G --hidden
+ @ f6298a8ac3a4 (draft): B1
+ |
+ | o e5ea8f9c7314 (draft): A1
+ |/
+ | x 6e72f0a95b5e (draft): B0
+ | |
+ | x 28b51eb45704 (draft): A0
+ |/
+ o a9bdc8b26820 (public): O
+
+ $ hg debugobsolete
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
+ $ cd ..
+ $ cd ..
+
+Actual Test for first version (changeset unknown remotly)
+---------------------------------------------------------
+
+ $ dotest A.3.a A1
+ ## Running testcase A.3.a
+ # testing echange of "A1" (e5ea8f9c7314)
+ ## initial state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing "A1" from main to pushdest
+ pushing to pushdest
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 2 nodes
+ OBSEXC: pushing 1 markers (62 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling "e5ea8f9c7314" from main into pulldest
+ pulling from main
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (62 bytes)
+ OBSEXC: 1 markers added
+ OBSEXC: DONE
+ (run 'hg update' to get a working copy)
+ ## post pull state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+
+
+other variant: changeset know remotly
+-------------------------------------------
+
+ $ setuprepos A.3.b
+ creating test repo for test case A.3.b
+ - pulldest
+ - main
+ - pushdest
+ cd into `main` and proceed with env setup
+ $ cd main
+ $ mkcommit A0
+ $ mkcommit B0
+ $ hg push -q ../pushdest
+ $ hg push -q ../pulldest
+ $ hg update -q 0
+ $ mkcommit A1
+ created new head
+ $ hg update -q 0
+ $ mkcommit B1
+ created new head
+ $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
+ $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
+ $ hg log -G --hidden
+ @ f6298a8ac3a4 (draft): B1
+ |
+ | o e5ea8f9c7314 (draft): A1
+ |/
+ | x 6e72f0a95b5e (draft): B0
+ | |
+ | x 28b51eb45704 (draft): A0
+ |/
+ o a9bdc8b26820 (public): O
+
+ $ hg debugobsolete
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
+ $ cd ..
+ $ cd ..
+
+Actual Test for first version (changeset unknown remotly)
+---------------------------------------------------------
+
+check it complains about multiple heads
+
+ $ cd A.3.b
+ $ hg push -R main -r e5ea8f9c7314 pushdest
+ pushing to pushdest
+ searching for changes
+ abort: push creates new remote head e5ea8f9c7314!
+ (merge or see "hg help push" for details about pushing new heads)
+ [255]
+ $ cd ..
+
+test obsmarkers exchange.
+
+ $ dotest A.3.b A1 -f
+ ## Running testcase A.3.b
+ # testing echange of "A1" (e5ea8f9c7314)
+ ## initial state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing "A1" from main to pushdest
+ pushing to pushdest
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files (+1 heads)
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 2 nodes
+ OBSEXC: pushing 1 markers (62 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling "e5ea8f9c7314" from main into pulldest
+ pulling from main
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 2 files (+1 heads)
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (62 bytes)
+ OBSEXC: 1 markers added
+ OBSEXC: DONE
+ (run 'hg heads' to see heads, 'hg merge' to merge)
+ 1 new unstable changesets
+ ## post pull state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-exchange-A4.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,118 @@
+
+Initial setup
+
+ $ . $TESTDIR/_exc-util.sh
+
+
+=== A.4 Push in the middle of the obsolescence chain ===
+
+.. (Where we show that we should not push the marker without the successors)
+..
+.. {{{
+.. B ◔
+.. |
+.. A⇠ø⇠○ A'
+.. |/
+.. ● O
+.. }}}
+..
+.. Marker exist from:
+..
+.. * `Aø⇠○ A'`
+.. * chain from A
+..
+.. Command run:
+..
+.. * hg push -r B
+..
+.. Expected exchange:
+..
+.. * Chain from A
+..
+.. Expected Exclude:
+..
+.. * `Aø⇠○ A'`
+
+
+initial
+
+ $ setuprepos A.4
+ creating test repo for test case A.4
+ - pulldest
+ - main
+ - pushdest
+ cd into `main` and proceed with env setup
+ $ cd main
+ $ mkcommit A0
+ $ mkcommit B
+ $ hg update 0
+ 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
+ $ mkcommit A1
+ created new head
+ $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'`
+ $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
+ $ hg log -G --hidden
+ @ e5ea8f9c7314 (draft): A1
+ |
+ | o 06055a7959d4 (draft): B
+ | |
+ | x 28b51eb45704 (draft): A0
+ |/
+ o a9bdc8b26820 (public): O
+
+ $ hg debugobsolete
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 {'date': '', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ $ cd ..
+ $ cd ..
+
+Actual Test for first version (changeset unknown remotly)
+---------------------------------------------------------
+
+ $ dotest A.4 B -f
+ ## Running testcase A.4
+ # testing echange of "B" (06055a7959d4)
+ ## initial state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing "B" from main to pushdest
+ pushing to pushdest
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 2 changesets with 2 changes to 2 files
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 3 nodes
+ OBSEXC: pushing 1 markers (62 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling "06055a7959d4" from main into pulldest
+ pulling from main
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 2 changesets with 2 changes to 2 files
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (62 bytes)
+ OBSEXC: 1 markers added
+ OBSEXC: DONE
+ (run 'hg update' to get a working copy)
+ ## post pull state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 {'date': '', 'user': 'test'}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-exchange-A5.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,128 @@
+
+
+Initial setup
+
+ $ . $TESTDIR/_exc-util.sh
+
+
+=== A.5 partial reordering ===
+..
+.. {{{
+.. B ø⇠⇠
+.. | ⇡
+.. A ø⇠⇠⇠○ A'
+.. | ⇡/
+.. | ○ B'
+.. |/
+.. ● O
+.. }}}
+..
+.. Marker exist from:
+..
+.. * `Aø⇠○ A'`
+.. * `Bø⇠○ B'`
+..
+.. Command run:
+..
+.. * hg push -r B
+..
+.. Expected exchange:
+..
+.. * `Bø⇠○ B'`
+..
+.. Expected Exclude:
+..
+.. * `Aø⇠○ A'`
+
+
+initial
+
+ $ setuprepos A.5
+ creating test repo for test case A.5
+ - pulldest
+ - main
+ - pushdest
+ cd into `main` and proceed with env setup
+ $ cd main
+ $ mkcommit A0
+ $ mkcommit B0
+ $ hg update 0
+ 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
+ $ mkcommit B1
+ created new head
+ $ mkcommit A1
+ $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'`
+ $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
+ $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
+ invalid branchheads cache (served): tip differs
+ $ hg log -G --hidden
+ @ 8c0a98c83722 (draft): A1
+ |
+ o f6298a8ac3a4 (draft): B1
+ |
+ | x 6e72f0a95b5e (draft): B0
+ | |
+ | x 28b51eb45704 (draft): A0
+ |/
+ o a9bdc8b26820 (public): O
+
+ $ hg debugobsolete
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 {'date': '', 'user': 'test'}
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 {'date': '', 'user': 'test'}
+ $ cd ..
+ $ cd ..
+
+Actual Test
+-----------
+
+ $ dotest A.5 B1
+ ## Running testcase A.5
+ # testing echange of "B1" (f6298a8ac3a4)
+ ## initial state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 {'date': '', 'user': 'test'}
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing "B1" from main to pushdest
+ pushing to pushdest
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 2 nodes
+ OBSEXC: pushing 1 markers (62 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 {'date': '', 'user': 'test'}
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling "f6298a8ac3a4" from main into pulldest
+ pulling from main
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (62 bytes)
+ OBSEXC: 1 markers added
+ OBSEXC: DONE
+ (run 'hg update' to get a working copy)
+ ## post pull state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 {'date': '', 'user': 'test'}
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-exchange-A6.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,146 @@
+
+
+
+Initial setup
+
+ $ . $TESTDIR/_exc-util.sh
+
+
+=== A.6 between existing changeset ===
+
+.. {{{
+.. A ◕⇠● B
+.. |/
+.. ● O
+.. }}}
+..
+.. Marker exist from:
+..
+.. * `A◕⇠● B`
+..
+.. Command run:
+..
+.. * hg push -r B
+.. * hg push
+..
+.. Expected exchange:
+..
+.. * `A◕⇠● B`
+
+
+initial
+
+ $ setuprepos A.6
+ creating test repo for test case A.6
+ - pulldest
+ - main
+ - pushdest
+ cd into `main` and proceed with env setup
+ $ cd main
+ $ mkcommit A0
+ $ hg update -q 0
+ $ mkcommit A1
+ created new head
+
+make both changeset known remotly
+
+ $ hg push -qf ../pushdest
+ $ hg push -qf ../pulldest
+
+create a marker after this
+
+ $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
+ $ hg log -G --hidden
+ @ e5ea8f9c7314 (draft): A1
+ |
+ | x 28b51eb45704 (draft): A0
+ |/
+ o a9bdc8b26820 (public): O
+
+ $ hg debugobsolete
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ $ cd ..
+ $ cd ..
+
+ $ cp -r A.6 A.6.a
+ $ cp -r A.6 A.6.b
+
+Actual Test (explicit push version)
+-----------------------------------
+
+ $ dotest A.6.a A1
+ ## Running testcase A.6.a
+ # testing echange of "A1" (e5ea8f9c7314)
+ ## initial state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing "A1" from main to pushdest
+ pushing to pushdest
+ searching for changes
+ no changes found
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 2 nodes
+ OBSEXC: pushing 1 markers (62 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling "e5ea8f9c7314" from main into pulldest
+ pulling from main
+ no changes found
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (62 bytes)
+ OBSEXC: 1 markers added
+ OBSEXC: DONE
+ ## post pull state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+
+Actual Test (bare push version)
+-----------------------------------
+
+ $ dotest A.6.b
+ ## Running testcase A.6.b
+ ## initial state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing from main to pushdest
+ pushing to pushdest
+ searching for changes
+ no changes found
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 3 nodes
+ OBSEXC: pushing 1 markers (62 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling from main into pulldest
+ pulling from main
+ searching for changes
+ no changes found
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (62 bytes)
+ OBSEXC: 1 markers added
+ OBSEXC: DONE
+ ## post pull state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-exchange-A7.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,82 @@
+
+Initial setup
+
+ $ . $TESTDIR/_exc-util.sh
+
+=== A.7 Non targeted common changeset ===
+
+.. {{{
+.. ⇠◕ A
+.. |
+.. ● O
+.. }}}
+..
+.. Marker exist from:
+..
+.. * Chain from A
+..
+.. Command run:
+..
+.. * hg push -r O
+..
+.. Expected exchange:
+..
+.. * ø
+
+
+ $ setuprepos A.7
+ creating test repo for test case A.7
+ - pulldest
+ - main
+ - pushdest
+ cd into `main` and proceed with env setup
+ $ cd main
+ $ mkcommit A
+ $ hg push -q ../pushdest
+ $ hg push -q ../pulldest
+ $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'`
+ $ hg log -G --hidden
+ @ f5bc6836db60 (draft): A
+ |
+ o a9bdc8b26820 (public): O
+
+ $ hg debugobsolete
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ $ cd ..
+ $ cd ..
+
+Actual Test
+-----------------------------------
+
+ $ dotest A.7 O
+ ## Running testcase A.7
+ # testing echange of "O" (a9bdc8b26820)
+ ## initial state
+ # obstore: main
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing "O" from main to pushdest
+ pushing to pushdest
+ searching for changes
+ no changes found
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 1 nodes
+ OBSEXC: no marker to push
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pulling "a9bdc8b26820" from main into pulldest
+ pulling from main
+ no changes found
+ OBSEXC: pull obsolescence markers
+ OBSEXC: no unknown remote markers
+ OBSEXC: DONE
+ ## post pull state
+ # obstore: main
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-exchange-B1.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,149 @@
+
+Initial setup
+
+ $ . $TESTDIR/_exc-util.sh
+
+=== B.1 Prune on non targeted common changeset ===
+
+.. {{{
+.. ⊗ B
+.. |
+.. ◕ A
+.. |
+.. ● O
+.. }}}
+..
+.. Marker exist from:
+..
+.. * B (prune)
+..
+.. Command run:
+..
+.. * hg push -r O
+.. * hg push
+..
+.. Expected exchange:
+..
+.. * B (prune)
+
+
+ $ setuprepos B.1
+ creating test repo for test case B.1
+ - pulldest
+ - main
+ - pushdest
+ cd into `main` and proceed with env setup
+ $ cd main
+ $ mkcommit A
+ $ mkcommit B
+ $ hg prune -qd '0 0' .
+ $ hg log -G --hidden
+ x f6fbb35d8ac9 (draft): B
+ |
+ @ f5bc6836db60 (draft): A
+ |
+ o a9bdc8b26820 (public): O
+
+ $ hg debugobsolete
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+ $ cd ..
+ $ cd ..
+
+
+ $ cp -r B.1 B.1.a
+ $ cp -r B.1 B.1.b
+
+Actual Test (explicite push version)
+-----------------------------------
+
+ $ dotest B.1.a A
+ ## Running testcase B.1.a
+ # testing echange of "A" (f5bc6836db60)
+ ## initial state
+ # obstore: main
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing "A" from main to pushdest
+ pushing to pushdest
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 2 nodes
+ OBSEXC: pushing 1 markers (89 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+ # obstore: pushdest
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling "f5bc6836db60" from main into pulldest
+ pulling from main
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (89 bytes)
+ OBSEXC: 1 markers added
+ OBSEXC: DONE
+ (run 'hg update' to get a working copy)
+ ## post pull state
+ # obstore: main
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+ # obstore: pushdest
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+ # obstore: pulldest
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+
+Actual Test (bare push version)
+-----------------------------------
+
+ $ dotest B.1.b
+ ## Running testcase B.1.b
+ ## initial state
+ # obstore: main
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing from main to pushdest
+ pushing to pushdest
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 2 nodes
+ OBSEXC: pushing 1 markers (89 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+ # obstore: pushdest
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling from main into pulldest
+ pulling from main
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (89 bytes)
+ OBSEXC: 1 markers added
+ OBSEXC: DONE
+ (run 'hg update' to get a working copy)
+ ## post pull state
+ # obstore: main
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+ # obstore: pushdest
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+ # obstore: pulldest
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-exchange-B2.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,129 @@
+
+Initial setup
+
+ $ . $TESTDIR/_exc-util.sh
+
+=== B.2 Pruned changeset on head. nothing pushed ===
+
+.. {{{
+.. ⊗ A
+.. |
+.. ● O
+.. }}}
+..
+.. Marker exist from:
+..
+.. * A (prune)
+..
+.. Command run:
+..
+.. * hg push -r O
+.. * hg push
+..
+.. Expected exchange:
+..
+.. * prune marker for A
+
+
+ $ setuprepos B.2
+ creating test repo for test case B.2
+ - pulldest
+ - main
+ - pushdest
+ cd into `main` and proceed with env setup
+ $ cd main
+ $ mkcommit A
+ $ hg prune -qd '0 0' .
+ $ hg log -G --hidden
+ x f5bc6836db60 (draft): A
+ |
+ @ a9bdc8b26820 (public): O
+
+ $ hg debugobsolete
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ $ cd ..
+ $ cd ..
+
+
+ $ cp -r B.2 B.2.a
+ $ cp -r B.2 B.2.b
+
+Actual Test (explicite push version)
+-----------------------------------
+
+ $ dotest B.2.a O
+ ## Running testcase B.2.a
+ # testing echange of "O" (a9bdc8b26820)
+ ## initial state
+ # obstore: main
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing "O" from main to pushdest
+ pushing to pushdest
+ searching for changes
+ no changes found
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 1 nodes
+ OBSEXC: pushing 1 markers (89 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling "a9bdc8b26820" from main into pulldest
+ pulling from main
+ no changes found
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (89 bytes)
+ OBSEXC: 1 markers added
+ OBSEXC: DONE
+ ## post pull state
+ # obstore: main
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pulldest
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+
+Actual Test (bare push version)
+-----------------------------------
+
+ $ dotest B.2.b
+ ## Running testcase B.2.b
+ ## initial state
+ # obstore: main
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing from main to pushdest
+ pushing to pushdest
+ searching for changes
+ no changes found
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 1 nodes
+ OBSEXC: pushing 1 markers (89 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling from main into pulldest
+ pulling from main
+ searching for changes
+ no changes found
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (89 bytes)
+ OBSEXC: 1 markers added
+ OBSEXC: DONE
+ ## post pull state
+ # obstore: main
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pulldest
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-exchange-B3.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,107 @@
+
+
+Initial setup
+
+ $ . $TESTDIR/_exc-util.sh
+
+=== B.3 Pruned changeset on non-pushed part of the history ===
+
+.. {{{
+.. ⊗ C
+.. |
+.. ○ B
+.. | ◔ A
+.. |/
+.. ● O
+.. }}}
+..
+.. Marker exist from:
+..
+.. * C (prune)
+..
+.. Command run:
+..
+.. * hg push -r A
+.. * hg push
+..
+.. Expected exchange:
+..
+.. * ø
+..
+.. Expected Exclude:
+..
+.. * chain from B
+
+
+ $ setuprepos B.3
+ creating test repo for test case B.3
+ - pulldest
+ - main
+ - pushdest
+ cd into `main` and proceed with env setup
+ $ cd main
+ $ mkcommit A
+ $ hg up --quiet 0
+ $ mkcommit B
+ created new head
+ $ mkcommit C
+ $ hg prune -qd '0 0' .
+ $ hg log -G --hidden
+ x e56289ab6378 (draft): C
+ |
+ @ 35b183996678 (draft): B
+ |
+ | o f5bc6836db60 (draft): A
+ |/
+ o a9bdc8b26820 (public): O
+
+ $ hg debugobsolete
+ e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {'date': '0 0', 'p1': '35b1839966785d5703a01607229eea932db42f87', 'user': 'test'}
+ $ cd ..
+ $ cd ..
+
+
+Actual Test
+-----------------------------------
+
+ $ dotest B.3 A
+ ## Running testcase B.3
+ # testing echange of "A" (f5bc6836db60)
+ ## initial state
+ # obstore: main
+ e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {'date': '0 0', 'p1': '35b1839966785d5703a01607229eea932db42f87', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing "A" from main to pushdest
+ pushing to pushdest
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 2 nodes
+ OBSEXC: no marker to push
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {'date': '0 0', 'p1': '35b1839966785d5703a01607229eea932db42f87', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pulling "f5bc6836db60" from main into pulldest
+ pulling from main
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ OBSEXC: pull obsolescence markers
+ OBSEXC: no unknown remote markers
+ OBSEXC: DONE
+ (run 'hg update' to get a working copy)
+ ## post pull state
+ # obstore: main
+ e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {'date': '0 0', 'p1': '35b1839966785d5703a01607229eea932db42f87', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-exchange-B4.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,155 @@
+
+Initial setup
+
+ $ . $TESTDIR/_exc-util.sh
+
+=== B.4 Pruned changeset on common part of history ===
+
+.. {{{
+.. ⊗ C
+.. | ● B
+.. | |
+.. | ● A
+.. |/
+.. ● O
+.. }}}
+..
+.. Marker exist from:
+..
+.. * C (prune)
+..
+.. Command run:
+..
+.. * hg push -r B
+.. * hg push
+..
+.. Expected exchange:
+..
+.. * prune for C
+
+
+ $ setuprepos B.4
+ creating test repo for test case B.4
+ - pulldest
+ - main
+ - pushdest
+ cd into `main` and proceed with env setup
+ $ cd main
+ $ mkcommit A
+ $ mkcommit B
+ $ hg phase --public .
+ $ hg push ../pushdest
+ pushing to ../pushdest
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 2 changesets with 2 changes to 2 files
+ $ hg push ../pulldest
+ pushing to ../pulldest
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 2 changesets with 2 changes to 2 files
+ $ hg update -q 0
+ $ mkcommit C
+ created new head
+ $ hg prune -qd '0 0' .
+ $ hg log -G --hidden
+ x 7f7f229b13a6 (draft): C
+ |
+ | o f6fbb35d8ac9 (public): B
+ | |
+ | o f5bc6836db60 (public): A
+ |/
+ @ a9bdc8b26820 (public): O
+
+ $ hg debugobsolete
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ $ cd ..
+ $ cd ..
+
+
+ $ cp -r B.4 B.4.a
+ $ cp -r B.4 B.4.b
+
+Actual Test (explicite push version)
+-----------------------------------
+
+ $ dotest B.4.a O
+ ## Running testcase B.4.a
+ # testing echange of "O" (a9bdc8b26820)
+ ## initial state
+ # obstore: main
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing "O" from main to pushdest
+ pushing to pushdest
+ searching for changes
+ no changes found
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 1 nodes
+ OBSEXC: pushing 1 markers (89 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling "a9bdc8b26820" from main into pulldest
+ pulling from main
+ no changes found
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (89 bytes)
+ OBSEXC: 1 markers added
+ OBSEXC: DONE
+ ## post pull state
+ # obstore: main
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pulldest
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+
+Actual Test (bare push version)
+-----------------------------------
+
+ $ dotest B.4.b
+ ## Running testcase B.4.b
+ ## initial state
+ # obstore: main
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing from main to pushdest
+ pushing to pushdest
+ searching for changes
+ no changes found
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 3 nodes
+ OBSEXC: pushing 1 markers (89 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling from main into pulldest
+ pulling from main
+ searching for changes
+ no changes found
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (89 bytes)
+ OBSEXC: 1 markers added
+ OBSEXC: DONE
+ ## post pull state
+ # obstore: main
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pulldest
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-exchange-B5.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,183 @@
+
+
+
+Initial setup
+
+ $ . $TESTDIR/_exc-util.sh
+
+
+=== B.5 Push of a children of changeset which successors is pruned ===
+
+.. This case Mirror A.4, with pruned changeset successors.
+..
+.. {{{
+.. B ◔
+.. |
+.. A⇠ø⇠⊗ A'
+.. |/
+.. ● O
+.. }}}
+..
+.. Marker exist from:
+..
+.. * `Aø⇠○ A'`
+.. * chain from A
+.. * `A'`
+..
+.. Command run:
+..
+.. * hg push -r B
+..
+.. Expected exchange:
+..
+.. * `Aø⇠○ A'`
+.. * chain from A
+.. * `A'`
+..
+.. Extra Note:
+..
+.. I'm not totally happy about this case and I believe some more complicated
+.. graph can result in behavior wuite confusing for the user (if some tool create
+.. prune maker in a the middle of a valid chain)
+
+ $ setuprepos B.5
+ creating test repo for test case B.5
+ - pulldest
+ - main
+ - pushdest
+ cd into `main` and proceed with env setup
+ $ cd main
+ $ mkcommit A0
+ $ mkcommit B
+ $ hg up --quiet 0
+ $ mkcommit A1
+ created new head
+ $ hg debugobsolete --hidden `getid 'desc(A0)'` `getid 'desc(A1)'`
+ $ hg prune -qd '0 0' .
+ $ hg log -G --hidden
+ x e5ea8f9c7314 (draft): A1
+ |
+ | o 06055a7959d4 (draft): B
+ | |
+ | x 28b51eb45704 (draft): A0
+ |/
+ @ a9bdc8b26820 (public): O
+
+ $ hg debugobsolete
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ $ cd ..
+ $ cd ..
+
+ $ cp -r B.5 B.5.a
+ $ cp -r B.5 B.5.b
+
+Actual Test (explicite push version)
+-------------------------------------
+
+ $ dotest B.5.a B -f
+ ## Running testcase B.5.a
+ # testing echange of "B" (06055a7959d4)
+ ## initial state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing "B" from main to pushdest
+ pushing to pushdest
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 2 changesets with 2 changes to 2 files
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 3 nodes
+ OBSEXC: pushing 2 markers (150 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling "06055a7959d4" from main into pulldest
+ pulling from main
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 2 changesets with 2 changes to 2 files
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (150 bytes)
+ OBSEXC: 2 markers added
+ OBSEXC: DONE
+ (run 'hg update' to get a working copy)
+ 1 new unstable changesets
+ ## post pull state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pulldest
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+
+Actual Test (bare push version)
+-------------------------------------
+
+ $ dotest B.5.b B -f
+ ## Running testcase B.5.b
+ # testing echange of "B" (06055a7959d4)
+ ## initial state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing "B" from main to pushdest
+ pushing to pushdest
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 2 changesets with 2 changes to 2 files
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 3 nodes
+ OBSEXC: pushing 2 markers (150 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling "06055a7959d4" from main into pulldest
+ pulling from main
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 2 changesets with 2 changes to 2 files
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (150 bytes)
+ OBSEXC: 2 markers added
+ OBSEXC: DONE
+ (run 'hg update' to get a working copy)
+ 1 new unstable changesets
+ ## post pull state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pulldest
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-exchange-B6.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,107 @@
+
+
+
+
+Initial setup
+
+ $ . $TESTDIR/_exc-util.sh
+
+== B.6 Pruned changeset with ancestors not in pushed set ===
+
+.. {{{
+.. B ø⇠⊗ B'
+.. | |
+.. A ○ |
+.. |/
+.. ● O
+.. }}}
+..
+.. Marker exist from:
+..
+.. * `Bø⇠⊗ B'`
+.. * B' prune
+..
+.. Command run:
+..
+.. * hg push -r O
+..
+.. Expected exchange:
+..
+.. * `Bø⇠⊗ B'`
+.. * B' prune
+
+ $ setuprepos B.6
+ creating test repo for test case B.6
+ - pulldest
+ - main
+ - pushdest
+ cd into `main` and proceed with env setup
+ $ cd main
+ $ mkcommit A
+ $ mkcommit B0
+ $ hg up --quiet 0
+ $ mkcommit B1
+ created new head
+ $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
+ $ hg prune -qd '0 0' .
+ $ hg log -G --hidden
+ x f6298a8ac3a4 (draft): B1
+ |
+ | x 962ecf6b1afc (draft): B0
+ | |
+ | o f5bc6836db60 (draft): A
+ |/
+ @ a9bdc8b26820 (public): O
+
+ $ hg debugobsolete
+ 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
+ f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ $ cd ..
+ $ cd ..
+
+Actual Test
+-------------------------------------
+
+ $ dotest B.6 O
+ ## Running testcase B.6
+ # testing echange of "O" (a9bdc8b26820)
+ ## initial state
+ # obstore: main
+ 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
+ f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing "O" from main to pushdest
+ pushing to pushdest
+ searching for changes
+ no changes found
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 1 nodes
+ OBSEXC: pushing 2 markers (150 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
+ f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
+ f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling "a9bdc8b26820" from main into pulldest
+ pulling from main
+ no changes found
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (150 bytes)
+ OBSEXC: 2 markers added
+ OBSEXC: DONE
+ ## post pull state
+ # obstore: main
+ 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
+ f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
+ f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pulldest
+ 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '', 'user': 'test'}
+ f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-exchange-B7.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,90 @@
+
+Initial setup
+
+ $ . $TESTDIR/_exc-util.sh
+
+
+=== B.7 Prune on non targeted common changeset ===
+..
+.. {{{
+.. ⊗ B
+.. |
+.. ◕ A
+.. |
+.. ● O
+.. }}}
+..
+.. Marker exist from:
+..
+.. * B (prune)
+..
+.. Command run:
+..
+.. * hg push -r O
+........ * hg push
+..
+.. Expected exchange:
+..
+.. * ø
+....... * B (prune)
+
+ $ setuprepos B.7
+ creating test repo for test case B.7
+ - pulldest
+ - main
+ - pushdest
+ cd into `main` and proceed with env setup
+ $ cd main
+ $ mkcommit A
+ $ hg push -q ../pushdest
+ $ hg push -q ../pulldest
+ $ mkcommit B
+ $ hg prune -qd '0 0' .
+ $ hg log -G --hidden
+ x f6fbb35d8ac9 (draft): B
+ |
+ @ f5bc6836db60 (draft): A
+ |
+ o a9bdc8b26820 (public): O
+
+ $ hg debugobsolete
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+ $ cd ..
+ $ cd ..
+
+Actual Test
+-------------------------------------
+
+ $ dotest B.7 O
+ ## Running testcase B.7
+ # testing echange of "O" (a9bdc8b26820)
+ ## initial state
+ # obstore: main
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing "O" from main to pushdest
+ pushing to pushdest
+ searching for changes
+ no changes found
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 1 nodes
+ OBSEXC: no marker to push
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pulling "a9bdc8b26820" from main into pulldest
+ pulling from main
+ no changes found
+ OBSEXC: pull obsolescence markers
+ OBSEXC: no unknown remote markers
+ OBSEXC: DONE
+ ## post pull state
+ # obstore: main
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-exchange-C1.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,147 @@
+
+Initial setup
+
+ $ . $TESTDIR/_exc-util.sh
+
+=== C.1 Multiple pruned changeset atop each other ===
+..
+.. {{{
+.. ⊗ B
+.. |
+.. ⊗ A
+.. |
+.. ● O
+.. }}}
+..
+.. Marker exist from:
+..
+.. * A (prune)
+.. * B (prune)
+..
+.. Command run:
+..
+.. * hg push -r O
+.. * hg push
+..
+.. Expected exchange:
+..
+.. * A (prune)
+.. * B (prune)
+
+ $ setuprepos C.1
+ creating test repo for test case C.1
+ - pulldest
+ - main
+ - pushdest
+ cd into `main` and proceed with env setup
+ $ cd main
+ $ mkcommit A
+ $ mkcommit B
+ $ hg prune -qd '0 0' .^::.
+ $ hg log -G --hidden
+ x f6fbb35d8ac9 (draft): B
+ |
+ x f5bc6836db60 (draft): A
+ |
+ @ a9bdc8b26820 (public): O
+
+ $ hg debugobsolete
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+ $ cd ..
+ $ cd ..
+
+ $ cp -r C.1 C.1.a
+ $ cp -r C.1 C.1.b
+
+Actual Test (explicite push)
+-------------------------------------
+
+ $ dotest C.1.a O
+ ## Running testcase C.1.a
+ # testing echange of "O" (a9bdc8b26820)
+ ## initial state
+ # obstore: main
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing "O" from main to pushdest
+ pushing to pushdest
+ searching for changes
+ no changes found
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 1 nodes
+ OBSEXC: pushing 2 markers (177 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+ # obstore: pushdest
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling "a9bdc8b26820" from main into pulldest
+ pulling from main
+ no changes found
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (177 bytes)
+ OBSEXC: 2 markers added
+ OBSEXC: DONE
+ ## post pull state
+ # obstore: main
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+ # obstore: pushdest
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+ # obstore: pulldest
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+
+Actual Test (bare push)
+-------------------------------------
+
+ $ dotest C.1.b
+ ## Running testcase C.1.b
+ ## initial state
+ # obstore: main
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing from main to pushdest
+ pushing to pushdest
+ searching for changes
+ no changes found
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 1 nodes
+ OBSEXC: pushing 2 markers (177 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+ # obstore: pushdest
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling from main into pulldest
+ pulling from main
+ searching for changes
+ no changes found
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (177 bytes)
+ OBSEXC: 2 markers added
+ OBSEXC: DONE
+ ## post pull state
+ # obstore: main
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+ # obstore: pushdest
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
+ # obstore: pulldest
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {'date': '0 0', 'p1': 'f5bc6836db60e308a17ba08bf050154ba9c4fad7', 'user': 'test'}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-exchange-C2.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,169 @@
+
+
+Initial setup
+
+ $ . $TESTDIR/_exc-util.sh
+
+=== C.2 Pruned changeset on precursors ===
+
+.. {{{
+.. B ⊗
+.. |
+.. A ø⇠◔ A'
+.. |/
+.. ● O
+.. }}}
+..
+.. Marker exist from:
+..
+.. * A' succeed to A
+.. * B (prune)
+..
+.. Command run:
+..
+.. * hg push -r A'
+.. * hg push
+..
+.. Expected exchange:
+..
+.. * `A ø⇠o A'`
+.. * B (prune)
+
+ $ setuprepos C.2
+ creating test repo for test case C.2
+ - pulldest
+ - main
+ - pushdest
+ cd into `main` and proceed with env setup
+ $ cd main
+ $ mkcommit A0
+ $ mkcommit B
+ $ hg prune -qd '0 0' .
+ $ hg update -q 0
+ $ mkcommit A1
+ created new head
+ $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
+ $ hg log -G --hidden
+ @ e5ea8f9c7314 (draft): A1
+ |
+ | x 06055a7959d4 (draft): B
+ | |
+ | x 28b51eb45704 (draft): A0
+ |/
+ o a9bdc8b26820 (public): O
+
+ $ hg debugobsolete
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ $ cd ..
+ $ cd ..
+
+ $ cp -r C.2 C.2.a
+ $ cp -r C.2 C.2.b
+
+Actual Test (explicite push)
+-------------------------------------
+
+ $ dotest C.2.a A1
+ ## Running testcase C.2.a
+ # testing echange of "A1" (e5ea8f9c7314)
+ ## initial state
+ # obstore: main
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing "A1" from main to pushdest
+ pushing to pushdest
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 2 nodes
+ OBSEXC: pushing 2 markers (150 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling "e5ea8f9c7314" from main into pulldest
+ pulling from main
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (150 bytes)
+ OBSEXC: 2 markers added
+ OBSEXC: DONE
+ (run 'hg update' to get a working copy)
+ ## post pull state
+ # obstore: main
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+
+Actual Test (bare push)
+-------------------------------------
+
+ $ dotest C.2.b
+ ## Running testcase C.2.b
+ ## initial state
+ # obstore: main
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing from main to pushdest
+ pushing to pushdest
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 2 nodes
+ OBSEXC: pushing 2 markers (150 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling from main into pulldest
+ pulling from main
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (150 bytes)
+ OBSEXC: 2 markers added
+ OBSEXC: DONE
+ (run 'hg update' to get a working copy)
+ ## post pull state
+ # obstore: main
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-exchange-C3.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,171 @@
+
+
+Initial setup
+
+ $ . $TESTDIR/_exc-util.sh
+
+
+=== C.3 Pruned changeset on precursors of another pruned one ===
+
+.. {{{
+.. B ⊗
+.. |
+.. A ø⇠⊗ A'
+.. |/
+.. ● O
+.. }}}
+..
+.. Marker exist from:
+..
+.. * A' succeed to A
+.. * A' (prune
+.. * B (prune)
+..
+.. Command run:
+..
+.. * hg push -r A'
+.. * hg push
+..
+.. Expected exchange:
+..
+.. * `A ø⇠⊗ A'`
+.. * A (prune)
+.. * B (prune)
+
+ $ setuprepos C.3
+ creating test repo for test case C.3
+ - pulldest
+ - main
+ - pushdest
+ cd into `main` and proceed with env setup
+ $ cd main
+ $ mkcommit A0
+ $ mkcommit B
+ $ hg prune -qd '0 0' .
+ $ hg update -q 0
+ $ mkcommit A1
+ created new head
+ $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
+ $ hg prune -qd '0 0' .
+ $ hg log -G --hidden
+ x e5ea8f9c7314 (draft): A1
+ |
+ | x 06055a7959d4 (draft): B
+ | |
+ | x 28b51eb45704 (draft): A0
+ |/
+ @ a9bdc8b26820 (public): O
+
+ $ hg debugobsolete
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ $ cd ..
+ $ cd ..
+
+ $ cp -r C.3 C.3.a
+ $ cp -r C.3 C.3.b
+
+Actual Test (explicite push)
+-------------------------------------
+
+ $ dotest C.3.a O
+ ## Running testcase C.3.a
+ # testing echange of "O" (a9bdc8b26820)
+ ## initial state
+ # obstore: main
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing "O" from main to pushdest
+ pushing to pushdest
+ searching for changes
+ no changes found
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 1 nodes
+ OBSEXC: pushing 3 markers (238 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling "a9bdc8b26820" from main into pulldest
+ pulling from main
+ no changes found
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (238 bytes)
+ OBSEXC: 3 markers added
+ OBSEXC: DONE
+ ## post pull state
+ # obstore: main
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pulldest
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+
+Actual Test (bare push)
+-------------------------------------
+
+ $ dotest C.3.b
+ ## Running testcase C.3.b
+ ## initial state
+ # obstore: main
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing from main to pushdest
+ pushing to pushdest
+ searching for changes
+ no changes found
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 1 nodes
+ OBSEXC: pushing 3 markers (238 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling from main into pulldest
+ pulling from main
+ searching for changes
+ no changes found
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (238 bytes)
+ OBSEXC: 3 markers added
+ OBSEXC: DONE
+ ## post pull state
+ # obstore: main
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pulldest
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-exchange-C4.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,125 @@
+
+
+Initial setup
+
+ $ . $TESTDIR/_exc-util.sh
+
+=== C.4 multiple successors, one is pruned ===
+
+.. Another case were prune are confusing? (A is killed without its successors being
+.. pushed)
+..
+.. (could split of divergence, if split see the Z section)
+..
+.. {{{
+.. A
+.. B ○⇢ø⇠⊗ C
+.. \|/
+.. ● O
+.. }}}
+..
+.. Marker exist from:
+..
+.. * `A ø⇠○ B`
+.. * `A ø⇠○ C`
+.. * C (prune)
+..
+..
+.. Command run:
+..
+.. * hg push -r O
+..
+.. Expected exchange:
+..
+.. * `A ø⇠○ C`
+.. * C (prune)
+..
+.. Expected exclude:
+..
+.. * `A ø⇠○ B`
+
+Implemented as the non-split version
+
+ $ setuprepos C.4
+ creating test repo for test case C.4
+ - pulldest
+ - main
+ - pushdest
+ cd into `main` and proceed with env setup
+ $ cd main
+ $ mkcommit A
+ $ hg update -q 0
+ $ mkcommit B
+ created new head
+ $ hg update -q 0
+ $ mkcommit C
+ created new head
+ $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(B)'`
+ $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'`
+ invalid branchheads cache (served): tip differs
+ $ hg prune -qd '0 0' .
+ $ hg log -G --hidden
+ x 7f7f229b13a6 (draft): C
+ |
+ | o 35b183996678 (draft): B
+ |/
+ | x f5bc6836db60 (draft): A
+ |/
+ @ a9bdc8b26820 (public): O
+
+ $ hg debugobsolete
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 {'date': '', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '', 'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ $ cd ..
+ $ cd ..
+
+Actual Test
+-------------------------------------
+
+ $ dotest C.4 O
+ ## Running testcase C.4
+ # testing echange of "O" (a9bdc8b26820)
+ ## initial state
+ # obstore: main
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 {'date': '', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing "O" from main to pushdest
+ pushing to pushdest
+ searching for changes
+ no changes found
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 1 nodes
+ OBSEXC: pushing 2 markers (150 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 {'date': '', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling "a9bdc8b26820" from main into pulldest
+ pulling from main
+ no changes found
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (150 bytes)
+ OBSEXC: 2 markers added
+ OBSEXC: DONE
+ ## post pull state
+ # obstore: main
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 {'date': '', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {'date': '', 'user': 'test'}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-exchange-D1.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,111 @@
+
+Initial setup
+
+ $ . $TESTDIR/_exc-util.sh
+
+=== D.1 Pruned changeset based on a missing precursors of something we miss ===
+
+.. {{{
+.. B ⊗
+.. |
+.. A ◌⇠◔ A'
+.. |/
+.. ● O
+.. }}}
+..
+.. Marker exist from:
+..
+.. * A' succeed to A
+.. * B (prune)
+..
+.. Command run:
+..
+.. * hg push -r A'
+.. * hg push
+..
+.. Expected exchange:
+..
+.. * `A ø⇠o A'`
+.. * B (prune)
+
+ $ setuprepos D.1
+ creating test repo for test case D.1
+ - pulldest
+ - main
+ - pushdest
+ cd into `main` and proceed with env setup
+ $ cd main
+ $ mkcommit A0
+ $ mkcommit B
+ $ hg up -q 0
+ $ mkcommit A1
+ created new head
+ $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
+ $ hg prune -d '0 0' 'desc(B)'
+ 1 changesets pruned
+ $ hg strip --hidden -q 'desc(A0)'
+ $ hg log -G --hidden
+ @ e5ea8f9c7314 (draft): A1
+ |
+ o a9bdc8b26820 (public): O
+
+ $ hg debugobsolete
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ $ cd ..
+ $ cd ..
+
+Actual Test
+-------------------------------------
+
+ $ dotest D.1 A1
+ ## Running testcase D.1
+ # testing echange of "A1" (e5ea8f9c7314)
+ ## initial state
+ # obstore: main
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing "A1" from main to pushdest
+ pushing to pushdest
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 2 nodes
+ OBSEXC: pushing 2 markers (150 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling "e5ea8f9c7314" from main into pulldest
+ pulling from main
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (150 bytes)
+ OBSEXC: 2 markers added
+ OBSEXC: DONE
+ (run 'hg update' to get a working copy)
+ ## post pull state
+ # obstore: main
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {'date': '0 0', 'p1': '28b51eb45704506b5c603decd6bf7ac5e0f6a52f', 'user': 'test'}
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-exchange-D2.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,100 @@
+
+
+Initial setup
+
+ $ . $TESTDIR/_exc-util.sh
+
+=== D.2 missing prune target (prune in "pushed set") ===
+
+{{{
+}}}
+
+Marker exist from:
+
+ * A' succeed to A
+ * A' (prune)
+
+Command run:
+
+ * hg push
+
+Expected exchange:
+
+ * `A ø⇠o A'`
+ * A' (prune)
+
+
+ $ setuprepos D.2
+ creating test repo for test case D.2
+ - pulldest
+ - main
+ - pushdest
+ cd into `main` and proceed with env setup
+ $ cd main
+ $ mkcommit A0
+ $ hg up -q 0
+ $ mkcommit A1
+ created new head
+ $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
+ $ hg prune --date '0 0' .
+ 1 changesets pruned
+ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ working directory now at a9bdc8b26820
+ $ hg strip --hidden -q 'desc(A1)'
+ $ hg log -G --hidden
+ x 28b51eb45704 (draft): A0
+ |
+ @ a9bdc8b26820 (public): O
+
+ $ hg debugobsolete
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ $ cd ..
+ $ cd ..
+
+Actual Test
+-------------------------------------
+
+ $ dotest D.2
+ ## Running testcase D.2
+ ## initial state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing from main to pushdest
+ pushing to pushdest
+ searching for changes
+ no changes found
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 1 nodes
+ OBSEXC: pushing 2 markers (150 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling from main into pulldest
+ pulling from main
+ searching for changes
+ no changes found
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (150 bytes)
+ OBSEXC: 2 markers added
+ OBSEXC: DONE
+ ## post pull state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pushdest
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+ # obstore: pulldest
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-exchange-D3.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,97 @@
+
+
+
+Initial setup
+
+ $ . $TESTDIR/_exc-util.sh
+
+=== D.2 missing prune target (prune in "pushed set") ===
+
+{{{
+}}}
+
+Marker exist from:
+
+ * A' succeed to A
+ * A' (prune)
+
+Command run:
+
+ * hg push
+
+Expected exchange:
+
+ * `A ø⇠o A'`
+ * A' (prune)
+
+
+ $ setuprepos D.2
+ creating test repo for test case D.2
+ - pulldest
+ - main
+ - pushdest
+ cd into `main` and proceed with env setup
+ $ cd main
+ $ mkcommit A0
+ $ hg up -q 0
+ $ mkcommit B
+ created new head
+ $ mkcommit A1
+ $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
+ $ hg prune -d '0 0' .
+ 1 changesets pruned
+ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ working directory now at 35b183996678
+ $ hg strip --hidden -q 'desc(A1)'
+ $ hg log -G --hidden
+ @ 35b183996678 (draft): B
+ |
+ | x 28b51eb45704 (draft): A0
+ |/
+ o a9bdc8b26820 (public): O
+
+ $ hg debugobsolete
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {'date': '', 'user': 'test'}
+ 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {'date': '0 0', 'p1': '35b1839966785d5703a01607229eea932db42f87', 'user': 'test'}
+ $ cd ..
+ $ cd ..
+
+Actual Test
+-------------------------------------
+
+ $ dotest D.2 O
+ ## Running testcase D.2
+ # testing echange of "O" (a9bdc8b26820)
+ ## initial state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {'date': '', 'user': 'test'}
+ 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {'date': '0 0', 'p1': '35b1839966785d5703a01607229eea932db42f87', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing "O" from main to pushdest
+ pushing to pushdest
+ searching for changes
+ no changes found
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 1 nodes
+ OBSEXC: no marker to push
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {'date': '', 'user': 'test'}
+ 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {'date': '0 0', 'p1': '35b1839966785d5703a01607229eea932db42f87', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pulling "a9bdc8b26820" from main into pulldest
+ pulling from main
+ no changes found
+ OBSEXC: pull obsolescence markers
+ OBSEXC: no unknown remote markers
+ OBSEXC: DONE
+ ## post pull state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {'date': '', 'user': 'test'}
+ 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {'date': '0 0', 'p1': '35b1839966785d5703a01607229eea932db42f87', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-exchange-D4.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,132 @@
+
+
+Initial setup
+
+ $ . $TESTDIR/_exc-util.sh
+
+=== D.4 Unknown changeset in between known one ===
+
+.. Mostly a clarification case
+..
+.. {{{
+.. ø⇠◌⇠○
+.. | |/
+.. | ◔
+.. |/
+.. ● O
+..
+.. }}}
+..
+.. Should be treated as A.3 case:
+..
+.. {{{
+..
+.. ø⇠○
+.. | |
+.. | ◔
+.. |/
+.. ● O
+..
+.. }}}
+
+
+initial
+
+ $ setuprepos A.3.a
+ creating test repo for test case A.3.a
+ - pulldest
+ - main
+ - pushdest
+ cd into `main` and proceed with env setup
+ $ cd main
+ $ mkcommit A0
+ $ mkcommit B0
+ $ hg update -q 0
+ $ mkcommit A1
+ created new head
+ $ mkcommit B1
+ $ hg debugobsolete `getid 'desc(A0)'` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A1)'`
+ $ hg debugobsolete `getid 'desc(B0)'` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+ $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(B1)'`
+ invalid branchheads cache (served): tip differs
+ $ hg log -G --hidden
+ @ 069b05c3876d (draft): B1
+ |
+ o e5ea8f9c7314 (draft): A1
+ |
+ | x 6e72f0a95b5e (draft): B0
+ | |
+ | x 28b51eb45704 (draft): A0
+ |/
+ o a9bdc8b26820 (public): O
+
+ $ hg debugobsolete
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 {'date': '', 'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 {'date': '', 'user': 'test'}
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 {'date': '', 'user': 'test'}
+ $ cd ..
+ $ cd ..
+
+Actual Test for first version (changeset unknown remotly)
+---------------------------------------------------------
+
+ $ dotest A.3.a A1
+ ## Running testcase A.3.a
+ # testing echange of "A1" (e5ea8f9c7314)
+ ## initial state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 {'date': '', 'user': 'test'}
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 {'date': '', 'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ # obstore: pulldest
+ ## pushing "A1" from main to pushdest
+ pushing to pushdest
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 2 nodes
+ OBSEXC: pushing 2 markers (123 bytes)
+ OBSEXC: DONE
+ ## post push state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 {'date': '', 'user': 'test'}
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 {'date': '', 'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 {'date': '', 'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ ## pulling "e5ea8f9c7314" from main into pulldest
+ pulling from main
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (123 bytes)
+ OBSEXC: 2 markers added
+ OBSEXC: DONE
+ (run 'hg update' to get a working copy)
+ ## post pull state
+ # obstore: main
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 {'date': '', 'user': 'test'}
+ 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 0 {'date': '', 'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 069b05c3876d56f62895e853a501ea58ea85f68d 0 {'date': '', 'user': 'test'}
+ # obstore: pushdest
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 {'date': '', 'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+ # obstore: pulldest
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 {'date': '', 'user': 'test'}
+ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-import.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,92 @@
+
+This feature requires mercurial 3.0
+(and the `only(` revset is 3.0 specific)
+
+ $ (hg help revset | grep '"only(' > /dev/null) || exit 80
+
+Test creation of obsolescence marker by path import
+
+ $ hg init auto-obsolete
+ $ cd auto-obsolete
+ $ echo '[extensions]' >> $HGRCPATH
+ $ echo 'rebase=' >> $HGRCPATH
+ $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+ $ echo A > a
+ $ hg commit -Am A
+ adding a
+ $ echo B > b
+ $ hg commit -Am B
+ adding b
+ $ hg up '.^'
+ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ $ echo C > c
+ $ hg commit -Am C
+ adding c
+ created new head
+ $ hg log -G
+ @ changeset: 2:eb8dd0f31b51
+ | tag: tip
+ | parent: 0:f2bbf19cf96d
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: C
+ |
+ | o changeset: 1:95b760afef3c
+ |/ user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: B
+ |
+ o changeset: 0:f2bbf19cf96d
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: A
+
+
+(actual test)
+
+ $ hg export 'desc(B)' | hg import - --obsolete
+ applying patch from stdin
+ $ hg log -G
+ @ changeset: 3:00c49133f17e
+ | tag: tip
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: B
+ |
+ o changeset: 2:eb8dd0f31b51
+ | parent: 0:f2bbf19cf96d
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: C
+ |
+ o changeset: 0:f2bbf19cf96d
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: A
+
+ $ hg debugobsolete
+ 95b760afef3c234ffb3f9fd391edcb36e60921a4 00c49133f17e5e5a52b6ef1b6d516c0e90b56d8a 0 {'date': '* *', 'user': 'test'} (glob)
+
+ $ hg rollback
+ repository tip rolled back to revision 2 (undo import)
+ working directory now based on revision 2
+ $ hg log -G
+ @ changeset: 2:eb8dd0f31b51
+ | tag: tip
+ | parent: 0:f2bbf19cf96d
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: C
+ |
+ | o changeset: 1:95b760afef3c
+ |/ user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: B
+ |
+ o changeset: 0:f2bbf19cf96d
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: A
+
+ $ hg debugobsolete
+
--- a/tests/test-obsolete-push.t Thu Aug 23 18:09:45 2012 +0200
+++ b/tests/test-obsolete-push.t Thu Jun 26 15:27:25 2014 +0100
@@ -5,7 +5,6 @@
> hgext.rebase=
> hgext.graphlog=
> EOF
- $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
$ template='{rev}:{node|short}@{branch}({obsolete}/{phase}) {desc|firstline}\n'
@@ -28,13 +27,14 @@
$ hg ci -qAm C c
$ hg phase --secret --force .
$ hg kill 0 1
- 1 new unstables changesets
+ 2 changesets pruned
+ 1 new unstable changesets
$ glog --hidden
@ 2:244232c2222a@default(unstable/secret) C
|
- | o 1:6c81ed0049f8@default(extinct/secret) B
+ | x 1:6c81ed0049f8@default(extinct/draft) B
|/
- o 0:1994f17a630e@default(suspended/secret) A
+ x 0:1994f17a630e@default(suspended/draft) A
$ hg init ../clone
$ cat > ../clone/.hg/hgrc <<EOF
@@ -44,5 +44,4 @@
$ hg outgoing ../clone --template "$template"
comparing with ../clone
searching for changes
- no changes found (ignored 2 secret changesets)
- [1]
+ 0:1994f17a630e@default(suspended/draft) A
--- a/tests/test-obsolete-rebase.t Thu Aug 23 18:09:45 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,218 +0,0 @@
- $ cat >> $HGRCPATH <<EOF
- > [defaults]
- > amend=-d "0 0"
- > [extensions]
- > hgext.rebase=
- > hgext.graphlog=
- > EOF
- $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH
-
- $ glog() {
- > hg glog --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n'\
- > "$@"
- > }
-
- $ hg init repo
- $ cd repo
- $ echo a > a
- $ hg ci -Am adda
- adding a
- $ echo a >> a
- $ hg ci -m changea
-
-Test regular rebase
-
- $ hg up 0
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ echo b > b
- $ hg ci -Am addb
- adding b
- created new head
- $ echo e > e
- $ hg ci -Am adde e
- $ hg rebase -d 1 -r 3 --detach --keep
- $ glog
- @ 4:9c5494949763@default(draft) adde
- |
- | o 3:98e4a024635e@default(draft) adde
- | |
- | o 2:102a90ea7b4a@default(draft) addb
- | |
- o | 1:540395c44225@default(draft) changea
- |/
- o 0:07f494440405@default(draft) adda
-
- $ glog --hidden
- @ 4:9c5494949763@default(draft) adde
- |
- | o 3:98e4a024635e@default(draft) adde
- | |
- | o 2:102a90ea7b4a@default(draft) addb
- | |
- o | 1:540395c44225@default(draft) changea
- |/
- o 0:07f494440405@default(draft) adda
-
- $ hg debugsuccessors
- $ hg --config extensions.hgext.mq= strip tip
- 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9c5494949763-backup.hg
- $ hg rebase -d 1 -r 3 --detach
- $ glog
- @ 4:9c5494949763@default(draft) adde
- |
- | o 2:102a90ea7b4a@default(draft) addb
- | |
- o | 1:540395c44225@default(draft) changea
- |/
- o 0:07f494440405@default(draft) adda
-
- $ glog --hidden
- @ 4:9c5494949763@default(draft) adde
- |
- | o 3:98e4a024635e@default(secret) adde
- | |
- | o 2:102a90ea7b4a@default(draft) addb
- | |
- o | 1:540395c44225@default(draft) changea
- |/
- o 0:07f494440405@default(draft) adda
-
- $ hg debugsuccessors
- 98e4a024635e 9c5494949763
-
-Test rebase with deleted empty revision
-
- $ hg up 0
- 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
- $ hg branch foo
- marked working directory as branch foo
- (branches are permanent and global, did you want a bookmark?)
- $ echo a >> a
- $ hg ci -m changea
- $ hg rebase -d 1
- $ glog --hidden
- o 5:4e322f7ce8e3@foo(secret) changea
- |
- | o 4:9c5494949763@default(draft) adde
- | |
- | | o 3:98e4a024635e@default(secret) adde
- | | |
- +---o 2:102a90ea7b4a@default(draft) addb
- | |
- | @ 1:540395c44225@default(draft) changea
- |/
- o 0:07f494440405@default(draft) adda
-
- $ hg debugsuccessors
- 4e322f7ce8e3 000000000000
- 98e4a024635e 9c5494949763
-
-Test rebase --collapse
-
- $ hg up 0
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ echo c > c
- $ hg ci -Am addc
- adding c
- created new head
- $ echo c >> c
- $ hg ci -m changec
- $ hg rebase --collapse -d 1
- merging c
- $ glog --hidden
- @ 8:a7773ffa7edc@default(draft) Collapsed revision
- |
- | o 7:03f31481307a@default(secret) changec
- | |
- | o 6:076e9b2ffbe1@default(secret) addc
- | |
- | | o 5:4e322f7ce8e3@foo(secret) changea
- | |/
- +---o 4:9c5494949763@default(draft) adde
- | |
- | | o 3:98e4a024635e@default(secret) adde
- | | |
- | | o 2:102a90ea7b4a@default(draft) addb
- | |/
- o | 1:540395c44225@default(draft) changea
- |/
- o 0:07f494440405@default(draft) adda
-
- $ hg debugsuccessors
- 03f31481307a a7773ffa7edc
- 076e9b2ffbe1 a7773ffa7edc
- 4e322f7ce8e3 000000000000
- 98e4a024635e 9c5494949763
-
-Test rebase --abort
-
- $ hg debugsuccessors > ../successors.old
- $ hg up 0
- 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
- $ echo d > d
- $ hg ci -Am addd d
- created new head
- $ echo b >> a
- $ hg ci -m appendab
- $ hg rebase -d 1
- merging a
- warning: conflicts during merge.
- merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
- abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
- [255]
- $ hg rebase --abort
- saved backup bundle to $TESTTMP/repo/.hg/strip-backup/03f165c84ea8-backup.hg
- rebase aborted
- $ hg debugsuccessors > ../successors.new
- $ diff -u ../successors.old ../successors.new
-
-Test rebase --continue
-
- $ hg rebase -d 1
- merging a
- warning: conflicts during merge.
- merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
- abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
- [255]
- $ hg resolve --tool internal:other a
- $ hg rebase --continue
- $ glog --hidden
- @ 12:1951ead97108@default(draft) appendab
- |
- o 11:03f165c84ea8@default(draft) addd
- |
- | o 10:4b9d80f48523@default(secret) appendab
- | |
- | o 9:a31943eabc43@default(secret) addd
- | |
- +---o 8:a7773ffa7edc@default(draft) Collapsed revision
- | |
- | | o 7:03f31481307a@default(secret) changec
- | | |
- | | o 6:076e9b2ffbe1@default(secret) addc
- | |/
- | | o 5:4e322f7ce8e3@foo(secret) changea
- | |/
- +---o 4:9c5494949763@default(draft) adde
- | |
- | | o 3:98e4a024635e@default(secret) adde
- | | |
- | | o 2:102a90ea7b4a@default(draft) addb
- | |/
- o | 1:540395c44225@default(draft) changea
- |/
- o 0:07f494440405@default(draft) adda
-
- $ hg debugsuccessors > ../successors.new
- $ diff -u ../successors.old ../successors.new
- --- ../successors.old* (glob)
- +++ ../successors.new* (glob)
- @@ -1,4 +1,6 @@
- 03f31481307a a7773ffa7edc
- 076e9b2ffbe1 a7773ffa7edc
- +4b9d80f48523 1951ead97108
- 4e322f7ce8e3 000000000000
- 98e4a024635e 9c5494949763
- +a31943eabc43 03f165c84ea8
- [1]
--- a/tests/test-obsolete.t Thu Aug 23 18:09:45 2012 +0200
+++ b/tests/test-obsolete.t Thu Jun 26 15:27:25 2014 +0100
@@ -4,17 +4,18 @@
> allow_push = *
> [phases]
> publish=False
- > [alias]
- > odiff=diff --rev 'limit(precursors(.),1)' --rev .
> [extensions]
- > hgext.graphlog=
+ > hgext.rebase=
> EOF
- $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH
+ $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
$ mkcommit() {
> echo "$1" > "$1"
> hg add "$1"
> hg ci -m "add $1"
> }
+ $ getid() {
+ > hg id --hidden --debug -ir "$1"
+ > }
$ alias qlog="hg log --template='{rev}\n- {node|short}\n'"
$ hg init local
@@ -27,9 +28,21 @@
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit obsol_c # 3
created new head
- $ hg debugobsolete 3 2
+ $ getid 2
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d
+ $ getid 3
+ 0d3f46688ccc6e756c7e96cf64c391c411309597
+ $ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597
+ $ hg debugobsolete
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 {'date': '', 'user': 'test'} (glob)
+Test hidden() revset
+
+ $ qlog -r 'hidden()' --hidden
+ 2
+ - 4538525df7e2
+
Test that obsolete changeset are hidden
$ qlog
@@ -82,7 +95,7 @@
$ hg up 1 -q
$ mkcommit "obsol_c'" # 4 (on 1)
created new head
- $ hg debugobsolete 4 3
+ $ hg debugobsolete `getid 3` `getid 4`
$ qlog
4
- 725c380fe99b
@@ -105,10 +118,19 @@
- 0d3f46688ccc
4
- 725c380fe99b
- $ hg up 3 -q
- Working directory parent is obsolete
+ $ hg up --hidden 3 -q
+ working directory parent is obsolete!
+(reported by parents too)
+ $ hg parents
+ changeset: 3:0d3f46688ccc
+ parent: 1:7c3bad9141dc
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: add obsol_c
+
+ working directory parent is obsolete!
$ mkcommit d # 5 (on 3)
- 1 new unstables changesets
+ 1 new unstable changesets
$ qlog -r 'obsolete()'
3
- 0d3f46688ccc
@@ -125,15 +147,15 @@
Test obsolete keyword
- $ hg glog --template '{rev}:{node|short}@{branch}({obsolete}/{phase}) {desc|firstline}\n' \
+ $ hg log -G --template '{rev}:{node|short}@{branch}({obsolete}/{phase}) {desc|firstline}\n' \
> --hidden
- @ 5:a7a6f2b5d8a5@default(unstable/secret) add d
+ @ 5:a7a6f2b5d8a5@default(unstable/draft) add d
|
| o 4:725c380fe99b@default(stable/draft) add obsol_c'
| |
- o | 3:0d3f46688ccc@default(suspended/secret) add obsol_c
+ x | 3:0d3f46688ccc@default(suspended/draft) add obsol_c
|/
- | o 2:4538525df7e2@default(extinct/secret) add c
+ | x 2:4538525df7e2@default(extinct/draft) add c
|/
o 1:7c3bad9141dc@default(stable/draft) add b
|
@@ -144,11 +166,13 @@
$ hg init ../other-new
$ hg phase --draft 'secret() - extinct()' # until we fix exclusion
+ abort: empty revision set
+ [255]
$ hg push ../other-new
pushing to ../other-new
searching for changes
- abort: push includes an unstable changeset: a7a6f2b5d8a5!
- (use 'hg stabilize' to get a stable history (or --force to proceed))
+ abort: push includes unstable changeset: a7a6f2b5d8a5!
+ (use 'hg evolve' to get a stable history or --force to ignore warnings)
[255]
$ hg push -f ../other-new
pushing to ../other-new
@@ -157,6 +181,10 @@
adding manifests
adding file changes
added 5 changesets with 5 changes to 5 files (+1 heads)
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 5 nodes
+ OBSEXC: pushing 2 markers (123 bytes)
+ OBSEXC: DONE
$ hg -R ../other-new verify
checking changesets
checking manifests
@@ -177,12 +205,12 @@
- 7c3bad9141dc
0
- 1f0dee641bb7
- $ hg up 3 -q
- Working directory parent is obsolete
+ $ hg up --hidden 3 -q
+ working directory parent is obsolete!
$ mkcommit obsol_d # 6
created new head
- 1 new unstables changesets
- $ hg debugobsolete 6 5
+ 1 new unstable changesets
+ $ hg debugobsolete `getid 5` `getid 6`
$ qlog
6
- 95de7fc6918d
@@ -200,8 +228,8 @@
$ hg push ../other-new
pushing to ../other-new
searching for changes
- abort: push includes an unstable changeset: 95de7fc6918d!
- (use 'hg stabilize' to get a stable history (or --force to proceed))
+ abort: push includes unstable changeset: 95de7fc6918d!
+ (use 'hg evolve' to get a stable history or --force to ignore warnings)
[255]
$ hg push ../other-new -f # use f because there is unstability
pushing to ../other-new
@@ -210,6 +238,10 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 5 nodes
+ OBSEXC: pushing 3 markers (184 bytes)
+ OBSEXC: DONE
$ qlog -R ../other-new
5
- 95de7fc6918d
@@ -230,23 +262,31 @@
$ hg push ../other-new
pushing to ../other-new
searching for changes
- no changes found (ignored 0 secret changesets)
+ no changes found
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 5 nodes
+ OBSEXC: pushing 3 markers (184 bytes)
+ OBSEXC: DONE
[1]
- $ hg up -q .^ # 3
- Working directory parent is obsolete
+ $ hg up --hidden -q .^ # 3
+ working directory parent is obsolete!
$ mkcommit "obsol_d'" # 7
created new head
- 1 new unstables changesets
- $ hg debugobsolete 7 6
+ 1 new unstable changesets
+ $ hg debugobsolete `getid 6` `getid 7`
$ hg pull -R ../other-new .
pulling from .
searching for changes
adding changesets
adding manifests
adding file changes
- added 1 changesets with 1 changes to 1 files (+1 heads)
- (run 'hg heads .' to see heads, 'hg merge' to merge)
+ added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (245 bytes)
+ OBSEXC: 1 markers added
+ OBSEXC: DONE
+ (run 'hg heads' to see heads, 'hg merge' to merge)
$ qlog -R ../other-new
6
- 909a0fb57e5d
@@ -261,55 +301,58 @@
pushing to stuff that doesn't support obsolete
- $ hg init ../other-old
- > # XXX I don't like this but changeset get published otherwise
- > # remove it when we will get a --keep-state flag for push
- $ echo '[extensions]' > ../other-old/.hg/hgrc
- $ echo "obsolete=!$(echo $(dirname $TESTDIR))/obsolete.py" >> ../other-old/.hg/hgrc
- $ hg push ../other-old
- pushing to ../other-old
- searching for changes
- abort: push includes an unstable changeset: 909a0fb57e5d!
- (use 'hg stabilize' to get a stable history (or --force to proceed))
- [255]
- $ hg push -f ../other-old
- pushing to ../other-old
- searching for changes
- adding changesets
- adding manifests
- adding file changes
- added 5 changesets with 5 changes to 5 files (+1 heads)
- $ qlog -R ../other-old
- 4
- - 909a0fb57e5d
- 3
- - 725c380fe99b
- 2
- - 0d3f46688ccc
- 1
- - 7c3bad9141dc
- 0
- - 1f0dee641bb7
+DISABLED. the _enable switch it global :-/
+
+.. $ hg init ../other-old
+.. > # XXX I don't like this but changeset get published otherwise
+.. > # remove it when we will get a --keep-state flag for push
+.. $ echo '[extensions]' > ../other-old/.hg/hgrc
+.. $ echo "obsolete=!$(echo $(dirname $TESTDIR))/obsolete.py" >> ../other-old/.hg/hgrc
+.. $ hg push ../other-old
+.. pushing to ../other-old
+.. searching for changes
+.. abort: push includes an unstable changeset: 909a0fb57e5d!
+.. (use 'hg evolve' to get a stable history or --force to ignore warnings)
+.. [255]
+.. $ hg push -f ../other-old
+.. pushing to ../other-old
+.. searching for changes
+.. adding changesets
+.. adding manifests
+.. adding file changes
+.. added 5 changesets with 5 changes to 5 files (+1 heads)
+.. $ qlog -R ../other-ol
+.. 4
+.. - 909a0fb57e5d
+.. 3
+.. - 725c380fe99b
+.. 2
+.. - 0d3f46688ccc
+.. 1
+.. - 7c3bad9141dc
+.. 0
+.. - 1f0dee641bb7
clone support
$ hg clone . ../cloned
> # The warning should go away once we have default value to set ready before we pull
- requesting all changes
- adding changesets
- adding manifests
- adding file changes
- added 5 changesets with 5 changes to 5 files (+1 heads)
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ qlog -R ../cloned
+ $ qlog -R ../cloned --hidden
+ 7
+ - 909a0fb57e5d
+ 6
+ - 95de7fc6918d
+ 5
+ - a7a6f2b5d8a5
4
- - 909a0fb57e5d
+ - 725c380fe99b
3
- - 725c380fe99b
+ - 0d3f46688ccc
2
- - 0d3f46688ccc
+ - 4538525df7e2
1
- 7c3bad9141dc
0
@@ -317,12 +360,12 @@
Test rollback support
- $ hg up .^ -q # 3
- Working directory parent is obsolete
+ $ hg up --hidden .^ -q # 3
+ working directory parent is obsolete!
$ mkcommit "obsol_d''"
created new head
- 1 new unstables changesets
- $ hg debugobsolete 8 7
+ 1 new unstable changesets
+ $ hg debugobsolete `getid 7` `getid 8`
$ cd ../other-new
$ hg up -q 3
$ hg pull ../local/
@@ -331,8 +374,12 @@
adding changesets
adding manifests
adding file changes
- added 1 changesets with 1 changes to 1 files (+1 heads)
- (run 'hg heads .' to see heads, 'hg merge' to merge)
+ added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (306 bytes)
+ OBSEXC: 1 markers added
+ OBSEXC: DONE
+ (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up -q 7 # to check rollback update behavior
$ qlog
@@ -354,7 +401,8 @@
add obsol_c'
branch: default
commit: 1 deleted, 2 unknown (clean)
- update: 4 new changesets, 4 branch heads (merge)
+ update: 2 new changesets, 2 branch heads (merge)
+ unstable: 1 changesets
$ qlog
6
- 909a0fb57e5d
@@ -379,8 +427,10 @@
created new head
$ hg id -n
9
- $ hg debugobsolete 9 0
- 83b5778897ad try to obsolete immutable changeset 1f0dee641bb7
+ $ hg debugobsolete `getid 0` `getid 9`
+83b5778897ad try to obsolete immutable changeset 1f0dee641bb7
+# at core level the warning is not issued
+# this is now a big issue now that we have bumped warning
$ qlog -r 'obsolete()'
3
- 0d3f46688ccc
@@ -400,7 +450,7 @@
0
- 1f0dee641bb7
- $ hg debugobsolete null 9 #kill
+ $ hg debugobsolete `getid 9` #kill
$ hg up null -q # to be not based on 9 anymore
$ qlog
8
@@ -414,36 +464,53 @@
0
- 1f0dee641bb7
+Check that auto update ignore hidden changeset
+ $ hg up 0
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg up
+ 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg id -n
+ 8
+
+Check that named update do too
+
+ $ hg update default
+ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg id -n
+ 8
+
+ $ hg up null -q # to be not based on 9 anymore
+
check rebase compat
- $ hg glog -r 'not extinct()' --template='{rev} - {node|short}\n'
- o 8 - 159dfc9fa5d3
+ $ hg log -G --template='{rev} - {node|short} {desc}\n'
+ o 8 - 159dfc9fa5d3 add obsol_d''
|
- | o 4 - 725c380fe99b
+ | o 4 - 725c380fe99b add obsol_c'
| |
- o | 3 - 0d3f46688ccc
+ x | 3 - 0d3f46688ccc add obsol_c
|/
- o 1 - 7c3bad9141dc
+ o 1 - 7c3bad9141dc add b
|
- o 0 - 1f0dee641bb7
+ o 0 - 1f0dee641bb7 add a
- $ hg glog --template='{rev} - {node|short}\n' `(hg --version | grep -q 'version 2.1') || echo '--hidden'`
- o 9 - 83b5778897ad
+ $ hg log -G --template='{rev} - {node|short}\n' --hidden
+ x 9 - 83b5778897ad
o 8 - 159dfc9fa5d3
|
- | o 7 - 909a0fb57e5d
+ | x 7 - 909a0fb57e5d
|/
- | o 6 - 95de7fc6918d
+ | x 6 - 95de7fc6918d
|/
- | o 5 - a7a6f2b5d8a5
+ | x 5 - a7a6f2b5d8a5
|/
| o 4 - 725c380fe99b
| |
- o | 3 - 0d3f46688ccc
+ x | 3 - 0d3f46688ccc
|/
- | o 2 - 4538525df7e2
+ | x 2 - 4538525df7e2
|/
o 1 - 7c3bad9141dc
|
@@ -452,20 +519,25 @@
should not rebase extinct changeset
- $ hg --config extensions.hgext.rebase= rebase -b 3 -d 4 --traceback
- $ hg --config extensions.graphlog= glog -r 'not extinct()' --template='{rev} - {node|short}\n'
- @ 11 - 9468a5f5d8b2
- |
- o 10 - 2033b4e49474
+#excluded 'whole rebase set is extinct and ignored.' message not in core
+ $ hg rebase -b '3' -d 4 --traceback
+ 2 new divergent changesets
+ $ hg up tip
+ ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob)
+ $ hg log -G --template='{rev} - {node|short} {desc}\n'
+ @ 11 - 9468a5f5d8b2 add obsol_d''
|
- o 4 - 725c380fe99b
+ o 10 - 2033b4e49474 add obsol_c
+ |
+ o 4 - 725c380fe99b add obsol_c'
|
- o 1 - 7c3bad9141dc
+ o 1 - 7c3bad9141dc add b
|
- o 0 - 1f0dee641bb7
+ o 0 - 1f0dee641bb7 add a
Does not complain about new head if you obsolete the old one
+(re necesarry when we start runnind discovery on unfiltered repo in core)
$ hg push ../other-new --traceback
pushing to ../other-new
@@ -473,11 +545,15 @@
adding changesets
adding manifests
adding file changes
- added 2 changesets with 1 changes to 1 files
+ added 2 changesets with 1 changes to [12] files (re)
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 5 nodes
+ OBSEXC: pushing 7 markers (452 bytes)
+ OBSEXC: DONE
$ hg up -q 10
$ mkcommit "obsol_d'''"
created new head
- $ hg debugobsolete 12 11
+ $ hg debugobsolete `getid 11` `getid 12`
$ hg push ../other-new --traceback
pushing to ../other-new
searching for changes
@@ -485,15 +561,19 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 5 nodes
+ OBSEXC: pushing 8 markers (513 bytes)
+ OBSEXC: DONE
$ cd ..
-check latecomer detection
+check bumped detection
(make an obsolete changeset public)
$ cd local
- $ hg phase --public 11
- 1 new latecomers changesets
- $ hg --config extensions.graphlog=glog glog --template='{rev} - ({phase}) {node|short} {desc}\n'
+ $ hg phase --hidden --public 11
+ 1 new bumped changesets
+ $ hg log -G --template='{rev} - ({phase}) {node|short} {desc}\n'
@ 12 - (draft) 6db5e282cb91 add obsol_d'''
|
| o 11 - (public) 9468a5f5d8b2 add obsol_d''
@@ -506,7 +586,7 @@
|
o 0 - (public) 1f0dee641bb7 add a
- $ hg log -r 'latecomer()'
+ $ hg log -r 'bumped()'
changeset: 12:6db5e282cb91
tag: tip
parent: 10:2033b4e49474
@@ -517,8 +597,8 @@
$ hg push ../other-new/
pushing to ../other-new/
searching for changes
- abort: push includes an latecomer changeset: 6db5e282cb91!
- (use 'hg stabilize' to get a stable history (or --force to proceed))
+ abort: push includes bumped changeset: 6db5e282cb91!
+ (use 'hg evolve' to get a stable history or --force to ignore warnings)
[255]
Check hg commit --amend compat
@@ -528,10 +608,9 @@
$ mkcommit f
created new head
$ echo 42 >> f
- $ hg commit --amend --traceback
- saved backup bundle to $TESTTMP/local/.hg/strip-backup/0b1b6dd009c0-amend-backup.hg
- $ hg glog
- @ changeset: 13:3734a65252e6
+ $ hg commit --amend --traceback --quiet
+ $ hg log -G
+ @ changeset: 15:705ab2a6b72e
| tag: tip
| parent: 10:2033b4e49474
| user: test
@@ -571,36 +650,197 @@
date: Thu Jan 01 00:00:00 1970 +0000
summary: add a
- $ hg debugsuccessors
- 0b1b6dd009c0 3734a65252e6
- 0d3f46688ccc 2033b4e49474
- 0d3f46688ccc 725c380fe99b
- 159dfc9fa5d3 9468a5f5d8b2
- 1f0dee641bb7 83b5778897ad
- 4538525df7e2 0d3f46688ccc
- 83b5778897ad 000000000000
- 909a0fb57e5d 159dfc9fa5d3
- 9468a5f5d8b2 6db5e282cb91
- 95de7fc6918d 909a0fb57e5d
- a7a6f2b5d8a5 95de7fc6918d
+ $ hg debugobsolete | grep -v 33d458d86621f3186c40bfccd77652f4a122743e
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 {'date': '', 'user': 'test'} (glob)
+ 0d3f46688ccc6e756c7e96cf64c391c411309597 725c380fe99b5e76613493f0903e8d11ddc70d54 0 {'date': '', 'user': 'test'} (glob)
+ a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 {'date': '', 'user': 'test'} (glob)
+ 95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 {'date': '', 'user': 'test'} (glob)
+ 909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 {'date': '', 'user': 'test'} (glob)
+ 1f0dee641bb7258c56bd60e93edfa2405381c41e 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 {'date': '', 'user': 'test'} (glob)
+ 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 {'date': '', 'user': 'test'} (glob)
+ 0d3f46688ccc6e756c7e96cf64c391c411309597 2033b4e494742365851fac84d276640cbf52833e 0 {'date': '* *', 'user': 'test'} (glob)
+ 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 0 {'date': '* *', 'user': 'test'} (glob)
+ 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 6db5e282cb91df5c43ff1f1287c119ff83230d42 0 {'date': '', 'user': 'test'} (glob)
+ 0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 {'date': '* *', 'user': 'test'} (glob)
+#no produced by 2.3
+33d458d86621f3186c40bfccd77652f4a122743e 3734a65252e69ddcced85901647a4f335d40de1e 0 {'date': '* *', 'user': 'test'} (glob)
-Check conflict detection
+Check divergence detection
$ hg up 9468a5f5d8b2 # add obsol_d''
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit "obsolet_conflicting_d"
$ hg summary
- parent: 14:50f11e5e3a63 tip
+ parent: 1[46]:50f11e5e3a63 tip (re)
add obsolet_conflicting_d
branch: default
commit: (clean)
- update: 9 new changesets, 9 branch heads (merge)
- $ hg debugobsolete 50f11e5e3a63 a7a6f2b5d8a5
- $ hg log -r 'conflicting()'
- changeset: 14:50f11e5e3a63
+ update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re)
+ bumped: 1 changesets
+ $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
+ $ hg log -r 'divergent()'
+ changeset: 12:6db5e282cb91
+ parent: 10:2033b4e49474
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: add obsol_d'''
+
+ changeset: 16:50f11e5e3a63
tag: tip
parent: 11:9468a5f5d8b2
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: add obsolet_conflicting_d
+
+ $ hg up --hidden 3 -q
+ working directory parent is obsolete!
+ $ hg evolve
+ parent is obsolete with multiple successors:
+ [4] add obsol_c'
+ [10] add obsol_c
+ [2]
+ $ hg olog
+ changeset: 2:4538525df7e2
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: add c
+
+
+Check import reports new unstable changeset:
+
+ $ hg up --hidden 2
+ 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ working directory parent is obsolete!
+ $ hg export 9468a5f5d8b2 | hg import -
+ applying patch from stdin
+ 1 new unstable changesets
+
+
+Relevant marker computation
+==============================
+
+ $ hg log -G --hidden
+ @ changeset: 17:a5f7a21fe7bc
+ | tag: tip
+ | parent: 2:4538525df7e2
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: add obsol_d''
+ |
+ | o changeset: 16:50f11e5e3a63
+ | | parent: 11:9468a5f5d8b2
+ | | user: test
+ | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | summary: add obsolet_conflicting_d
+ | |
+ | | o changeset: 15:705ab2a6b72e
+ | | | parent: 10:2033b4e49474
+ | | | user: test
+ | | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | | summary: add f
+ | | |
+ | | | x changeset: 14:33d458d86621
+ | | | | user: test
+ | | | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | | | summary: temporary amend commit for 0b1b6dd009c0
+ | | | |
+ | | | x changeset: 13:0b1b6dd009c0
+ | | |/ parent: 10:2033b4e49474
+ | | | user: test
+ | | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | | summary: add f
+ | | |
+ | | | o changeset: 12:6db5e282cb91
+ | | |/ parent: 10:2033b4e49474
+ | | | user: test
+ | | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | | summary: add obsol_d'''
+ | | |
+ | o | changeset: 11:9468a5f5d8b2
+ | |/ user: test
+ | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | summary: add obsol_d''
+ | |
+ | o changeset: 10:2033b4e49474
+ | | parent: 4:725c380fe99b
+ | | user: test
+ | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | summary: add obsol_c
+ | |
+ | | x changeset: 9:83b5778897ad
+ | | parent: -1:000000000000
+ | | user: test
+ | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | summary: add toto
+ | |
+ | | x changeset: 8:159dfc9fa5d3
+ | | | parent: 3:0d3f46688ccc
+ | | | user: test
+ | | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | | summary: add obsol_d''
+ | | |
+ | | | x changeset: 7:909a0fb57e5d
+ | | |/ parent: 3:0d3f46688ccc
+ | | | user: test
+ | | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | | summary: add obsol_d'
+ | | |
+ | | | x changeset: 6:95de7fc6918d
+ | | |/ parent: 3:0d3f46688ccc
+ | | | user: test
+ | | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | | summary: add obsol_d
+ | | |
+ | | | x changeset: 5:a7a6f2b5d8a5
+ | | |/ parent: 3:0d3f46688ccc
+ | | | user: test
+ | | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | | summary: add d
+ | | |
+ | o | changeset: 4:725c380fe99b
+ | | | parent: 1:7c3bad9141dc
+ | | | user: test
+ | | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | | summary: add obsol_c'
+ | | |
+ | | x changeset: 3:0d3f46688ccc
+ | |/ parent: 1:7c3bad9141dc
+ | | user: test
+ | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | summary: add obsol_c
+ | |
+ x | changeset: 2:4538525df7e2
+ |/ user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: add c
+ |
+ o changeset: 1:7c3bad9141dc
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: add b
+ |
+ o changeset: 0:1f0dee641bb7
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: add a
+
+
+Simple rewrite
+
+ $ hg --hidden debugobsoleterelevant 3
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 {'date': '', 'user': 'test'}
+
+simple rewrite with a prune attached to it
+
+ $ hg debugobsoleterelevant 15
+ 0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 {'date': '* *', 'user': 'test'} (glob)
+ 33d458d86621f3186c40bfccd77652f4a122743e 0 {'date': '* *', 'p1': '0b1b6dd009c037985363e2290a0b579819f659db', 'user': 'test'} (glob)
+
+Transitive rewrite
+
+ $ hg --hidden debugobsoleterelevant 8
+ 909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 {'date': '', 'user': 'test'}
+ 95de7fc6918dea4c9c8d5382f50649794b474c4a 909a0fb57e5d909f353d89e394ffd7e0890fec88 0 {'date': '', 'user': 'test'}
+ a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 95de7fc6918dea4c9c8d5382f50649794b474c4a 0 {'date': '', 'user': 'test'}
+
--- a/tests/test-oldconvert.t Thu Aug 23 18:09:45 2012 +0200
+++ b/tests/test-oldconvert.t Thu Jun 26 15:27:25 2014 +0100
@@ -53,8 +53,8 @@
date: Thu Jan 01 00:00:00 1970 +0000
summary: add a
- $ hg debugsuccessors
- 7c3bad9141dc d67cd0334eee
+ $ hg debugobsolete
+ 7c3bad9141dcb46ff89abf5f61856facd56e476c d67cd0334eeecfded222fed9009f0db4beb57585 0 {'date': '* *', 'user': 'test'} (glob)
$ hg debugconvertobsolete
nothing to do
0 obsolete marker converted
@@ -107,8 +107,8 @@
[255]
$ hg debugconvertobsolete --traceback
3 obsolete marker converted
- $ hg debugsuccessors
- 2c3784e102bb
- 3e03d82708d4 3218406b50ed
- 5c722672795c
- 7c3bad9141dc d67cd0334eee
+ $ hg debugobsolete
+ 7c3bad9141dcb46ff89abf5f61856facd56e476c d67cd0334eeecfded222fed9009f0db4beb57585 0 {'date': '* *', 'user': 'test'} (glob)
+ 3e03d82708d4da97a92158558dd13386d8f09ad5 3218406b50ed13480765e7c260669620f37fba6e 0 {'date': '* *', 'user': 'Pierre-Yves David <pierre-yves.david@ens-lyon.org>'} (glob)
+ 5c722672795c3a2cb94d0cc9a821c394c1475f87 0 {'date': '* *', 'user': 'Pierre-Yves David <pierre-yves.david@logilab.fr>'} (glob)
+ 2c3784e102bb34ccc93862af5bd6d609ee30c577 0 {'date': '* *', 'user': 'Pierre-Yves David <pierre-yves.david@logilab.fr>'} (glob)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-prev-next.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,62 @@
+ $ cat >> $HGRCPATH <<EOF
+ > [extensions]
+ > hgext.rebase=
+ > hgext.graphlog=
+ > EOF
+ $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+
+hg prev should move active bookmark
+ $ hg init
+ $ touch a
+ $ hg add a
+ $ hg commit -m 'added a'
+ $ touch b
+ $ hg add b
+ $ hg commit -m 'added b'
+ $ hg bookmark mark
+ $ hg bookmarks
+ * mark 1:6e742c9127b3
+ $ hg prev
+ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ [0] added a
+ $ hg bookmarks
+ * mark 0:a154386e50d1
+
+hg next should move active bookmark
+ $ hg next
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ [1] added b
+ $ hg bookmarks
+ * mark 1:6e742c9127b3
+
+hg next/prev should not interfere with inactive bookmarks
+ $ touch c
+ $ hg add c
+ $ hg commit -m 'added c'
+ $ hg bookmark -r2 no-move
+ $ hg prev
+ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ [1] added b
+ $ hg bookmarks
+ * mark 1:6e742c9127b3
+ no-move 2:4e26ef31f919
+ $ hg next
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ [2] added c
+ $ hg bookmarks
+ * mark 2:4e26ef31f919
+ no-move 2:4e26ef31f919
+ $ hg up 1
+ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ $ hg next
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ [2] added c
+ $ hg bookmarks
+ mark 2:4e26ef31f919
+ no-move 2:4e26ef31f919
+ $ hg prev
+ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ [1] added b
+ $ hg bookmarks
+ mark 2:4e26ef31f919
+ no-move 2:4e26ef31f919
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-prune.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,289 @@
+ $ cat >> $HGRCPATH <<EOF
+ > [ui]
+ > logtemplate={rev}:{node|short}[{bookmarks}] ({obsolete}/{phase}) {desc|firstline}\n
+ > [extensions]
+ > hgext.rebase=
+ > EOF
+ $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+
+ $ mkcommit() {
+ > echo "$1" > "$1"
+ > hg add "$1"
+ > hg ci -m "add $1"
+ > }
+
+ $ hg init repo
+ $ cd repo
+ $ mkcommit a
+ $ hg phase --public .
+ $ mkcommit b
+ $ mkcommit c
+ $ mkcommit d
+ $ mkcommit e
+ $ hg bookmarks BABAR
+ $ hg log -G
+ @ 4:9d206ffc875e[BABAR] (stable/draft) add e
+ |
+ o 3:47d2a3944de8[] (stable/draft) add d
+ |
+ o 2:4538525df7e2[] (stable/draft) add c
+ |
+ o 1:7c3bad9141dc[] (stable/draft) add b
+ |
+ o 0:1f0dee641bb7[] (stable/public) add a
+
+
+Check simple case
+----------------------------
+
+prune current and tip changeset
+
+ $ hg prune --user blah --date '1979-12-15' .
+ 1 changesets pruned
+ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ working directory now at 47d2a3944de8
+ $ hg debugobsolete
+ 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '314064000 0', ('p1': '47d2a3944de8b013de3be9578e8e344ea2e6c097', )?'user': 'blah'} (re)
+
+prune leaving unstability behind
+
+ $ hg prune 1
+ 1 changesets pruned
+ 2 new unstable changesets
+ $ hg debugobsolete
+ 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '314064000 0', ('p1': '47d2a3944de8b013de3be9578e8e344ea2e6c097', )?'user': 'blah'} (re)
+ 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {'date': '\d+ \d+', ('p1': '1f0dee641bb7258c56bd60e93edfa2405381c41e', )?'user': 'test'} (re)
+
+pruning multiple changeset at once
+
+ $ hg prune 2:
+ 2 changesets pruned
+ 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
+ working directory now at 1f0dee641bb7
+ $ hg debugobsolete
+ 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '314064000 0', ('p1': '47d2a3944de8b013de3be9578e8e344ea2e6c097', )?'user': 'blah'} (re)
+ 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {'date': '\d+ \d+', ('p1': '1f0dee641bb7258c56bd60e93edfa2405381c41e', )?'user': 'test'} (re)
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {'date': '\d+ \d+', ('p1': '7c3bad9141dcb46ff89abf5f61856facd56e476c', )?'user': 'test'} (re)
+ 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {'date': '\d+ \d+', ('p1': '4538525df7e2b9f09423636c61ef63a4cb872a2d', )?'user': 'test'} (re)
+
+cannot prune public changesets
+
+ $ hg prune 0
+ abort: cannot prune immutable changeset: 1f0dee641bb7
+ (see "hg help phases" for details)
+ [255]
+ $ hg debugobsolete
+ 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '314064000 0', ('p1': '47d2a3944de8b013de3be9578e8e344ea2e6c097', )?'user': 'blah'} (re)
+ 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {'date': '\d+ \d+', ('p1': '1f0dee641bb7258c56bd60e93edfa2405381c41e', )?'user': 'test'} (re)
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {'date': '\d+ \d+', ('p1': '7c3bad9141dcb46ff89abf5f61856facd56e476c', )?'user': 'test'} (re)
+ 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {'date': '\d+ \d+', ('p1': '4538525df7e2b9f09423636c61ef63a4cb872a2d', )?'user': 'test'} (re)
+
+Check successors addition
+----------------------------
+
+ $ mkcommit bb
+ $ mkcommit cc
+ $ mkcommit dd
+ $ mkcommit ee
+ $ hg up 0
+ 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
+ $ mkcommit nB
+ created new head
+ $ mkcommit nC
+ $ mkcommit nD
+ $ mkcommit nE
+
+ $ hg log -G
+ @ 12:6e8148413dd5[] (stable/draft) add nE
+ |
+ o 11:8ee176ff1d4b[] (stable/draft) add nD
+ |
+ o 10:aa96dc3f04c2[] (stable/draft) add nC
+ |
+ o 9:6f6f25e4f748[] (stable/draft) add nB
+ |
+ | o 8:bb5e90a7ea1f[] (stable/draft) add ee
+ | |
+ | o 7:00ded550b1e2[] (stable/draft) add dd
+ | |
+ | o 6:354011cd103f[] (stable/draft) add cc
+ | |
+ | o 5:814c38b95e72[] (stable/draft) add bb
+ |/
+ o 0:1f0dee641bb7[BABAR] (stable/public) add a
+
+
+one old, one new
+
+ $ hg up 'desc("add ee")'
+ 4 files updated, 0 files merged, 4 files removed, 0 files unresolved
+ $ hg prune 'desc("add ee")' -s 'desc("add nE")'
+ 1 changesets pruned
+ 4 files updated, 0 files merged, 4 files removed, 0 files unresolved
+ working directory now at 6e8148413dd5
+ $ hg debugobsolete
+ 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '314064000 0', ('p1': '47d2a3944de8b013de3be9578e8e344ea2e6c097', )?'user': 'blah'} (re)
+ 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {'date': '\d+ \d+', ('p1': '1f0dee641bb7258c56bd60e93edfa2405381c41e', )?'user': 'test'} (re)
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {'date': '\d+ \d+', ('p1': '7c3bad9141dcb46ff89abf5f61856facd56e476c', )?'user': 'test'} (re)
+ 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {'date': '\d+ \d+', ('p1': '4538525df7e2b9f09423636c61ef63a4cb872a2d', )?'user': 'test'} (re)
+ bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 {'date': '\d+ \d+', 'user': 'test'} (re)
+ $ hg log -G
+ @ 12:6e8148413dd5[] (stable/draft) add nE
+ |
+ o 11:8ee176ff1d4b[] (stable/draft) add nD
+ |
+ o 10:aa96dc3f04c2[] (stable/draft) add nC
+ |
+ o 9:6f6f25e4f748[] (stable/draft) add nB
+ |
+ | o 7:00ded550b1e2[] (stable/draft) add dd
+ | |
+ | o 6:354011cd103f[] (stable/draft) add cc
+ | |
+ | o 5:814c38b95e72[] (stable/draft) add bb
+ |/
+ o 0:1f0dee641bb7[BABAR] (stable/public) add a
+
+
+one old, two new
+
+ $ hg prune 'desc("add dd")' -s 'desc("add nD")' -s 'desc("add nC")'
+ 1 changesets pruned
+ $ hg debugobsolete
+ 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '314064000 0', ('p1': '47d2a3944de8b013de3be9578e8e344ea2e6c097', )?'user': 'blah'} (re)
+ 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {'date': '\d+ \d+', ('p1': '1f0dee641bb7258c56bd60e93edfa2405381c41e', )?'user': 'test'} (re)
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {'date': '\d+ \d+', ('p1': '7c3bad9141dcb46ff89abf5f61856facd56e476c', )?'user': 'test'} (re)
+ 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {'date': '\d+ \d+', ('p1': '4538525df7e2b9f09423636c61ef63a4cb872a2d', )?'user': 'test'} (re)
+ bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 {'date': '*', 'user': 'test'} (glob)
+ 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 {'date': '**', 'user': 'test'} (glob)
+ $ hg log -G
+ @ 12:6e8148413dd5[] (stable/draft) add nE
+ |
+ o 11:8ee176ff1d4b[] (stable/draft) add nD
+ |
+ o 10:aa96dc3f04c2[] (stable/draft) add nC
+ |
+ o 9:6f6f25e4f748[] (stable/draft) add nB
+ |
+ | o 6:354011cd103f[] (stable/draft) add cc
+ | |
+ | o 5:814c38b95e72[] (stable/draft) add bb
+ |/
+ o 0:1f0dee641bb7[BABAR] (stable/public) add a
+
+
+two old, two new (should be denied)
+
+ $ hg prune 'desc("add cc")' 'desc("add bb")' -s 'desc("add nD")' -s 'desc("add nC")'
+ abort: Can't use multiple successors for multiple precursors
+ [255]
+ $ hg debugobsolete
+ 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '314064000 0', ('p1': '47d2a3944de8b013de3be9578e8e344ea2e6c097', )?'user': 'blah'} (re)
+ 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {'date': '\d+ \d+', ('p1': '1f0dee641bb7258c56bd60e93edfa2405381c41e', )?'user': 'test'} (re)
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {'date': '\d+ \d+', ('p1': '7c3bad9141dcb46ff89abf5f61856facd56e476c', )?'user': 'test'} (re)
+ 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {'date': '\d+ \d+', ('p1': '4538525df7e2b9f09423636c61ef63a4cb872a2d', )?'user': 'test'} (re)
+ bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 {'date': '*', 'user': 'test'} (glob)
+ 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 {'date': '**', 'user': 'test'} (glob)
+
+two old, one new:
+
+ $ hg prune 'desc("add cc")' 'desc("add bb")' -s 'desc("add nB")'
+ 2 changesets pruned
+ $ hg debugobsolete
+ 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '314064000 0', ('p1': '47d2a3944de8b013de3be9578e8e344ea2e6c097', )?'user': 'blah'} (re)
+ 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {'date': '\d+ \d+', ('p1': '1f0dee641bb7258c56bd60e93edfa2405381c41e', )?'user': 'test'} (re)
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {'date': '\d+ \d+', ('p1': '7c3bad9141dcb46ff89abf5f61856facd56e476c', )?'user': 'test'} (re)
+ 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {'date': '\d+ \d+', ('p1': '4538525df7e2b9f09423636c61ef63a4cb872a2d', )?'user': 'test'} (re)
+ bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 {'date': '*', 'user': 'test'} (glob)
+ 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 {'date': '**', 'user': 'test'} (glob)
+ 814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 {'date': '*', 'user': 'test'} (glob)
+ 354011cd103f58bbbd9091a3cee6d6a6bd0dddf7 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 {'date': '*', 'user': 'test'} (glob)
+
+two old, two new with --biject
+
+ $ hg up 0
+ 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
+ $ mkcommit n1
+ created new head
+ $ mkcommit n2
+
+ $ hg prune 'desc("add n1")::desc("add n2")' -s 'desc("add nD")::desc("add nE")' --biject
+ 2 changesets pruned
+ 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
+ working directory now at 1f0dee641bb7
+ $ hg debugobsolete
+ 9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '314064000 0', ('p1': '47d2a3944de8b013de3be9578e8e344ea2e6c097', )?'user': 'blah'} (re)
+ 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {'date': '\d+ \d+', ('p1': '1f0dee641bb7258c56bd60e93edfa2405381c41e', )?'user': 'test'} (re)
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {'date': '\d+ \d+', ('p1': '7c3bad9141dcb46ff89abf5f61856facd56e476c', )?'user': 'test'} (re)
+ 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {'date': '\d+ \d+', ('p1': '4538525df7e2b9f09423636c61ef63a4cb872a2d', )?'user': 'test'} (re)
+ bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 {'date': '*', 'user': 'test'} (glob)
+ 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 {'date': '**', 'user': 'test'} (glob)
+ 814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 {'date': '* *', 'user': 'test'} (glob)
+ 354011cd103f58bbbd9091a3cee6d6a6bd0dddf7 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 {'date': '* *', 'user': 'test'} (glob)
+ cb7f8f706a6532967b98cf8583a81baab79a0fa7 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 {'date': '* *', 'user': 'test'} (glob)
+ 21b6f2f1cece8c10326e575dd38239189d467190 6e8148413dd541855b72a920a90c06fca127c7e7 0 {'date': '* *', 'user': 'test'} (glob)
+
+test hg prune -B bookmark
+yoinked from test-mq-strip.t
+
+ $ cd ..
+ $ hg init bookmarks
+ $ cd bookmarks
+ $ hg debugbuilddag '..<2.*1/2:m<2+3:c<m+3:a<2.:b'
+ $ hg bookmark -r 'a' 'todelete'
+ $ hg bookmark -r 'b' 'B'
+ $ hg bookmark -r 'b' 'nostrip'
+ $ hg bookmark -r 'c' 'delete'
+ $ hg up -C todelete
+ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg prune -B nostrip
+ bookmark 'nostrip' deleted
+ abort: nothing to prune
+ [255]
+ $ hg tag --remove --local a
+ $ hg prune -B todelete
+ 1 changesets pruned
+ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ working directory now at d62d843c9a01
+ bookmark 'todelete' deleted
+ $ hg id -ir dcbb326fdec2
+ abort: unknown revision 'dcbb326fdec2'!
+ [255]
+ $ hg id -ir d62d843c9a01
+ d62d843c9a01
+ $ hg bookmarks
+ B 10:ff43616e5d0f
+ delete 6:2702dd0c91e7
+ $ hg prune -B delete
+ 3 changesets pruned
+ bookmark 'delete' deleted
+ $ hg tag --remove --local c
+ $ hg id -ir 6:2702dd0c91e7
+ abort: unknown revision '2702dd0c91e7'!
+ [255]
+
+ $ hg debugobsstorestat
+ markers total: 4
+ for known precursors: 4
+ with parents data: [04] (re)
+ markers with no successors: 4
+ 1 successors: 0
+ 2 successors: 0
+ more than 2 successors: 0
+ average meta length: (27|71) (re)
+ available keys:
+ date: 4
+ p1: [04] (re)
+ user: 4
+ disconnected clusters: 4
+ any known node: 4
+ smallest length: 1
+ longer length: 1
+ median length: 1
+ mean length: 1
+ using parents data: [42] (re)
+ any known node: 4
+ smallest length: 1
+ longer length: [13] (re)
+ median length: [13] (re)
+ mean length: [12] (re)
--- a/tests/test-qsync.t Thu Aug 23 18:09:45 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,241 +0,0 @@
- $ cat >> $HGRCPATH <<EOF
- > [defaults]
- > amend=-d "0 0"
- > [web]
- > push_ssl = false
- > allow_push = *
- > [phases]
- > publish = False
- > [alias]
- > qlog = log --template='{rev} - {node|short} {desc} ({phase})\n'
- > mqlog = log --mq --template='{rev} - {desc}\n'
- > [diff]
- > git = 1
- > unified = 0
- > [extensions]
- > hgext.rebase=
- > hgext.graphlog=
- > hgext.mq=
- > EOF
- $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH
- $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
- $ echo "qsync=$(echo $(dirname $TESTDIR))/hgext/qsync.py" >> $HGRCPATH
- $ mkcommit() {
- > echo "$1" > "$1"
- > hg add "$1"
- > hg ci -m "add $1"
- > }
-
-basic sync
-
- $ hg init local
- $ cd local
- $ hg qinit -c
- $ hg qci -m "initial commit"
- $ mkcommit a
- $ mkcommit b
- $ hg qlog
- 1 - 7c3bad9141dc add b (draft)
- 0 - 1f0dee641bb7 add a (draft)
- $ hg qsync -a
- $ hg mqlog
- 2 - qsubmit commit
-
- * DEFAULT-add_a.diff ready for review
- * DEFAULT-add_b.diff ready for review
- 1 - qsubmit init
- 0 - initial commit
-
-basic sync II
-
- $ hg init local
- $ cd local
- $ hg qinit -c
- $ hg qci -m "initial commit"
- $ mkcommit a
- $ mkcommit b
- $ hg qlog
- 1 - 7c3bad9141dc add b (draft)
- 0 - 1f0dee641bb7 add a (draft)
- $ hg qsync -a
- $ hg mqlog
- 2 - qsubmit commit
-
- * DEFAULT-add_a.diff ready for review
- * DEFAULT-add_b.diff ready for review
- 1 - qsubmit init
- 0 - initial commit
-
- $ echo "b" >> b
- $ hg amend
- $ hg qsync -a
- $ hg mqlog
- 3 - qsubmit commit
-
- * DEFAULT-add_b.diff ready for review
- 2 - qsubmit commit
-
- * DEFAULT-add_a.diff ready for review
- * DEFAULT-add_b.diff ready for review
- 1 - qsubmit init
- 0 - initial commit
-
- $ hg up -r 0
- 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- $ echo "a" >> a
- $ hg amend
- 1 new unstables changesets
- $ hg graft -O 3
- grafting revision 3
- $ hg qsync -a
- $ hg mqlog
- 4 - qsubmit commit
-
- * DEFAULT-add_a.diff ready for review
- * DEFAULT-add_b.diff ready for review
- 3 - qsubmit commit
-
- * DEFAULT-add_b.diff ready for review
- 2 - qsubmit commit
-
- * DEFAULT-add_a.diff ready for review
- * DEFAULT-add_b.diff ready for review
- 1 - qsubmit init
- 0 - initial commit
-
-sync with published changeset
-
- $ hg init local
- $ cd local
- $ hg qinit -c
- $ hg qci -m "initial commit"
- $ mkcommit a
- $ mkcommit b
- $ hg qlog
- 1 - 7c3bad9141dc add b (draft)
- 0 - 1f0dee641bb7 add a (draft)
- $ hg qsync -a
- $ hg mqlog
- 2 - qsubmit commit
-
- * DEFAULT-add_a.diff ready for review
- * DEFAULT-add_b.diff ready for review
- 1 - qsubmit init
- 0 - initial commit
-
- $ hg phase -p 0
- $ hg qsync -a
- $ hg mqlog
- 3 - qsubmit commit
-
- * applied DEFAULT-add_a.diff
- 2 - qsubmit commit
-
- * DEFAULT-add_a.diff ready for review
- * DEFAULT-add_b.diff ready for review
- 1 - qsubmit init
- 0 - initial commit
-
- $ mkcommit c
- $ mkcommit d
- $ hg qsync -a
- $ hg mqlog
- 4 - qsubmit commit
-
- * DEFAULT-add_c.diff ready for review
- * DEFAULT-add_d.diff ready for review
- 3 - qsubmit commit
-
- * applied DEFAULT-add_a.diff
- 2 - qsubmit commit
-
- * DEFAULT-add_a.diff ready for review
- * DEFAULT-add_b.diff ready for review
- 1 - qsubmit init
- 0 - initial commit
-
- $ cd ..
- $ hg qclone -U local local2
- $ cd local2
- $ hg qlog
- 3 - 47d2a3944de8 add d (draft)
- 2 - 4538525df7e2 add c (draft)
- 1 - 7c3bad9141dc add b (draft)
- 0 - 1f0dee641bb7 add a (public)
- $ hg strip -n 1 --no-backup
- $ hg up
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ hg up --mq 4
- 6 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ hg qseries
- DEFAULT-add_b.diff
- DEFAULT-add_c.diff
- DEFAULT-add_d.diff
- $ hg qpush
- applying DEFAULT-add_b.diff
- now at: DEFAULT-add_b.diff
- $ hg qfinish -a
- $ hg phase -p .
- $ hg qci -m "applied DEFAULT-add_b.diff"
- $ cd ../local
- $ hg pull ../local2
- pulling from ../local2
- searching for changes
- no changes found
- (run 'hg update' to get a working copy)
- $ hg pull --mq ../local2/.hg/patches
- pulling from ../local2/.hg/patches
- searching for changes
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 1 changes to 1 files
- (run 'hg update' to get a working copy)
- $ hg qlog
- 3 - 47d2a3944de8 add d (draft)
- 2 - 4538525df7e2 add c (draft)
- 1 - 7c3bad9141dc add b (public)
- 0 - 1f0dee641bb7 add a (public)
- $ hg mqlog -l 1
- 5 - applied DEFAULT-add_b.diff
- $ hg status --mq --rev tip:-2
- M series
- A DEFAULT-add_b.diff
- $ hg qsync -a
- $ hg status --mq --rev tip:-2
- M qsubmitdata
- $ hg mqlog -l 1
- 6 - qsubmit commit
-
- * applied DEFAULT-add_b.diff
- $ hg qsync -a
- abort: Nothing changed
- [255]
-
-mixed sync
-
- $ hg init local
- $ cd local
- $ hg qinit -c
- $ mkcommit a
- $ mkcommit b
- $ hg qlog
- 1 - 7c3bad9141dc add b (draft)
- 0 - 1f0dee641bb7 add a (draft)
- $ hg qsync -a
- $ hg mqlog
- 1 - qsubmit commit
-
- * DEFAULT-add_a.diff ready for review
- * DEFAULT-add_b.diff ready for review
- 0 - qsubmit init
- $ hg phase -p 0
- $ echo "b" >> b
- $ hg amend
- $ hg qsync -a
- $ hg mqlog -l 1
- 2 - qsubmit commit
-
- * applied DEFAULT-add_a.diff
- * DEFAULT-add_b.diff ready for review
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-simple4server.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,186 @@
+
+ $ cat >> $HGRCPATH <<EOF
+ > [defaults]
+ > amend=-d "0 0"
+ > [web]
+ > push_ssl = false
+ > allow_push = *
+ > [phases]
+ > publish = False
+ > [extensions]
+ > hgext.rebase=
+ > EOF
+
+ $ mkcommit() {
+ > echo "$1" > "$1"
+ > hg add "$1"
+ > hg ci -m "add $1"
+ > }
+
+setup repo
+
+ $ hg init server
+ $ echo "[extensions]" >> ./server/.hg/hgrc
+ $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/simple4server.py" >> ./server/.hg/hgrc
+ $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
+ $ cat hg.pid >> $DAEMON_PIDS
+
+ $ hg clone http://localhost:$HGPORT/ client
+ no changes found
+ updating to branch default
+ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ echo "[extensions]" >> ./client/.hg/hgrc
+ $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> ./client/.hg/hgrc
+ $ cp -r client other
+
+Smoke testing
+===============
+
+ $ cd client
+ $ mkcommit 0
+ $ mkcommit a
+ $ hg push
+ pushing to http://localhost:$HGPORT/
+ searching for changes
+ remote: adding changesets
+ remote: adding manifests
+ remote: adding file changes
+ remote: added 2 changesets with 2 changes to 2 files
+ $ hg pull
+ pulling from http://localhost:$HGPORT/
+ searching for changes
+ no changes found
+ OBSEXC: pull obsolescence markers
+ OBSEXC: looking for common markers in 2 nodes
+ OBSEXC: no unknown remote markers
+ OBSEXC: DONE
+ $ hg pull -R ../other
+ pulling from http://localhost:$HGPORT/
+ requesting all changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 2 changesets with 2 changes to 2 files
+ OBSEXC: pull obsolescence markers
+ OBSEXC: looking for common markers in 2 nodes
+ OBSEXC: no unknown remote markers
+ OBSEXC: DONE
+ (run 'hg update' to get a working copy)
+ $ hg push -R ../other
+ pushing to http://localhost:$HGPORT/
+ searching for changes
+ no changes found
+ [1]
+
+Capacity testing
+===================
+
+ $ curl --silent http://localhost:$HGPORT/?cmd=hello
+ capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch stream unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_b2x_obsmarkers_0
+ $ curl --silent http://localhost:$HGPORT/?cmd=capabilities
+ lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch stream unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_b2x_obsmarkers_0 (no-eol)
+
+ $ curl --silent "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
+ bookmarks
+ namespaces
+ obsolete
+ phases
+
+Push
+=============
+
+ $ echo 'A' > a
+ $ hg amend
+ $ hg push
+ pushing to http://localhost:$HGPORT/
+ searching for changes
+ remote: adding changesets
+ remote: adding manifests
+ remote: adding file changes
+ remote: added 1 changesets with 1 changes to 1 files (+1 heads)
+ OBSEXC: computing relevant nodes
+ OBSEXC: looking for common markers in 2 nodes
+ OBSEXC: computing markers relevant to 1 nodes
+ OBSEXC: pushing 2 markers (171 bytes)
+ OBSEXC: DONE
+ $ hg push
+ pushing to http://localhost:$HGPORT/
+ searching for changes
+ no changes found
+ OBSEXC: computing relevant nodes
+ OBSEXC: looking for common markers in [23] nodes (re)
+ OBSEXC: markers already in sync
+ OBSEXC: no marker to push
+ OBSEXC: DONE
+ [1]
+
+Pull
+=============
+
+ $ hg -R ../other pull
+ pulling from http://localhost:$HGPORT/
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
+ OBSEXC: pull obsolescence markers
+ OBSEXC: looking for common markers in [23] nodes (re)
+ OBSEXC: merging obsolescence markers (171 bytes)
+ OBSEXC: 2 markers added
+ OBSEXC: DONE
+ (run 'hg heads' to see heads)
+ $ hg -R ../other pull
+ pulling from http://localhost:$HGPORT/
+ searching for changes
+ no changes found
+ OBSEXC: pull obsolescence markers
+ OBSEXC: looking for common markers in [23] nodes (re)
+ OBSEXC: no unknown remote markers
+ OBSEXC: DONE
+
+ $ cd ..
+
+Test disabling obsolete advertisement
+===========================================
+(used by bitbucket to select which repo use evolve)
+
+ $ curl --silent "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
+ bookmarks
+ namespaces
+ obsolete
+ phases
+ $ curl --silent http://localhost:$HGPORT/?cmd=hello
+ capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch stream unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_b2x_obsmarkers_0
+ $ curl --silent http://localhost:$HGPORT/?cmd=capabilities
+ lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch stream unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_b2x_obsmarkers_0 (no-eol)
+
+ $ echo '[__temporary__]' >> server/.hg/hgrc
+ $ echo 'advertiseobsolete=False' >> server/.hg/hgrc
+ $ $TESTDIR/killdaemons.py
+ $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
+ $ cat hg.pid >> $DAEMON_PIDS
+
+ $ curl --silent "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
+ bookmarks
+ namespaces
+ phases
+ $ curl --silent http://localhost:$HGPORT/?cmd=hello
+ capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch stream unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024
+ $ curl --silent http://localhost:$HGPORT/?cmd=capabilities
+ lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch stream unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 (no-eol)
+
+ $ echo 'advertiseobsolete=True' >> server/.hg/hgrc
+ $ $TESTDIR/killdaemons.py
+ $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
+ $ cat hg.pid >> $DAEMON_PIDS
+
+ $ curl --silent "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
+ bookmarks
+ namespaces
+ obsolete
+ phases
+ $ curl --silent http://localhost:$HGPORT/?cmd=hello
+ capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch stream unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_b2x_obsmarkers_0
+ $ curl --silent http://localhost:$HGPORT/?cmd=capabilities
+ lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch stream unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_b2x_obsmarkers_0 (no-eol)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-stabilize-conflict.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,259 @@
+=================================================================
+This files test the proper behavior of evo during merge conflict.
+=================================================================
+
+Initial setup
+
+ $ cat >> $HGRCPATH <<EOF
+ > [ui]
+ > interactive=false
+ > merge=internal:merge
+ > [defaults]
+ > amend=-d "0 0"
+ > [merge-tools]
+ > touch.checkchanged=true
+ > touch.gui=true
+ > touch.args=babar
+ > [extensions]
+ > hgext.rebase=
+ > EOF
+ $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+
+ $ safesed() {
+ > sed "$1" "$2" > `pwd`/sed.temp
+ > mv `pwd`/sed.temp "$2"
+ > }
+
+create a simple repo
+
+ $ hg init repo
+ $ cd repo
+ $ cat << EOF > babar
+ > un
+ > deux
+ > trois
+ > quatre
+ > cinq
+ > EOF
+ $ hg add babar
+ $ hg commit -m "babar count up to five"
+ $ cat << EOF >> babar
+ > six
+ > sept
+ > huit
+ > neuf
+ > dix
+ > EOF
+ $ hg commit -m "babar count up to ten"
+ $ cat << EOF >> babar
+ > onze
+ > douze
+ > treize
+ > quatorze
+ > quinze
+ > EOF
+ $ hg commit -m "babar count up to fifteen"
+
+
+proper behavior without conflict
+----------------------------------
+
+ $ hg gdown
+ gdown have been deprecated in favor of previous
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ [1] babar count up to ten
+ $ safesed 's/huit/eight/' babar
+ $ hg diff
+ diff -r 9d5daf8bd956 babar
+ --- a/babar Thu Jan 01 00:00:00 1970 +0000
+ +++ b/babar * (glob)
+ @@ -5,6 +5,6 @@
+ cinq
+ six
+ sept
+ -huit
+ +eight
+ neuf
+ dix
+ $ hg amend
+ 1 new unstable changesets
+ $ hg evolve
+ move:[2] babar count up to fifteen
+ atop:[4] babar count up to ten
+ merging babar
+ $ hg resolve -l
+ $ hg log -G
+ @ changeset: 5:71c18f70c34f
+ | tag: tip
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: babar count up to fifteen
+ |
+ o changeset: 4:5977072d13c5
+ | parent: 0:29ec1554cfaf
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: babar count up to ten
+ |
+ o changeset: 0:29ec1554cfaf
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: babar count up to five
+
+
+
+proper behavior with conflict using internal:merge
+--------------------------------------------------
+
+ $ hg gdown
+ gdown have been deprecated in favor of previous
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ [4] babar count up to ten
+ $ safesed 's/dix/ten/' babar
+ $ hg diff
+ diff -r 5977072d13c5 babar
+ --- a/babar Thu Jan 01 00:00:00 1970 +0000
+ +++ b/babar * (glob)
+ @@ -7,4 +7,4 @@
+ sept
+ eight
+ neuf
+ -dix
+ +ten
+ $ hg amend
+ 1 new unstable changesets
+ $ hg evolve
+ move:[5] babar count up to fifteen
+ atop:[7] babar count up to ten
+ merging babar
+ warning: conflicts during merge.
+ merging babar incomplete! (edit conflicts, then use 'hg resolve --mark')
+ evolve failed!
+ fix conflict and run "hg evolve --continue"
+ abort: unresolved merge conflicts (see hg help resolve)
+ [255]
+ $ hg resolve -l
+ U babar
+ $ hg log -G
+ @ changeset: 7:e04690b09bc6
+ | tag: tip
+ | parent: 0:29ec1554cfaf
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: babar count up to ten
+ |
+ | @ changeset: 5:71c18f70c34f
+ | | user: test
+ | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | summary: babar count up to fifteen
+ | |
+ | x changeset: 4:5977072d13c5
+ |/ parent: 0:29ec1554cfaf
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: babar count up to ten
+ |
+ o changeset: 0:29ec1554cfaf
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: babar count up to five
+
+(fix the conflict and continue)
+
+ $ hg revert -r 5 --all
+ reverting babar
+ $ safesed 's/dix/ten/' babar
+ $ hg resolve --all -m
+ $ hg evolve --continue
+ grafting revision 5
+ $ hg resolve -l
+ $ hg log -G
+ @ changeset: 8:1836b91c6c1d
+ | tag: tip
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: babar count up to fifteen
+ |
+ o changeset: 7:e04690b09bc6
+ | parent: 0:29ec1554cfaf
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: babar count up to ten
+ |
+ o changeset: 0:29ec1554cfaf
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: babar count up to five
+
+proper behavior with conflict using an external merge tools
+-----------------------------------------------------------
+
+ $ safesed 's/merge=.*/merge=touch/' $HGRCPATH
+ $ safesed 's/touch.gui=.*/touch.gui=false/' $HGRCPATH
+ $ hg gdown
+ gdown have been deprecated in favor of previous
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ [7] babar count up to ten
+ $ safesed 's/ten/zehn/' babar
+ $ hg diff
+ diff -r e04690b09bc6 babar
+ --- a/babar Thu Jan 01 00:00:00 1970 +0000
+ +++ b/babar * (glob)
+ @@ -7,4 +7,4 @@
+ sept
+ eight
+ neuf
+ -ten
+ +zehn
+ $ hg amend
+ 1 new unstable changesets
+ $ safesed 's/interactive=.*/interactive=true/' $HGRCPATH
+ $ HGMERGE=touch hg evolve <<EOF
+ > n
+ > EOF
+ move:[8] babar count up to fifteen
+ atop:[10] babar count up to ten
+ merging babar
+ output file babar appears unchanged
+ was merge successful (yn)? merging babar failed!
+ evolve failed!
+ fix conflict and run "hg evolve --continue"
+ abort: unresolved merge conflicts (see hg help resolve)
+ [255]
+ $ hg resolve -l
+ U babar
+ $ hg log -G
+ @ changeset: 10:b20d08eea373
+ | tag: tip
+ | parent: 0:29ec1554cfaf
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: babar count up to ten
+ |
+ | @ changeset: 8:1836b91c6c1d
+ | | user: test
+ | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | summary: babar count up to fifteen
+ | |
+ | x changeset: 7:e04690b09bc6
+ |/ parent: 0:29ec1554cfaf
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | summary: babar count up to ten
+ |
+ o changeset: 0:29ec1554cfaf
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: babar count up to five
+
+ $ cat babar
+ un
+ deux
+ trois
+ quatre
+ cinq
+ six
+ sept
+ eight
+ neuf
+ zehn
--- a/tests/test-stabilize-order.t Thu Aug 23 18:09:45 2012 +0200
+++ b/tests/test-stabilize-order.t Thu Jun 26 15:27:25 2014 +0100
@@ -5,7 +5,6 @@
> hgext.rebase=
> hgext.graphlog=
> EOF
- $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
$ glog() {
@@ -36,50 +35,52 @@
o 0:c471ef929e6a@default(draft) addroot
$ hg gdown
+ gdown have been deprecated in favor of previous
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
[2] addb
$ echo b >> b
$ hg amend
- 1 new unstables changesets
+ 1 new unstable changesets
$ hg gdown
+ gdown have been deprecated in favor of previous
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
[1] adda
$ echo a >> a
$ hg amend
- 1 new unstables changesets
+ 1 new unstable changesets
$ glog
- @ 7:f5ff10856e5a@default(draft) adda
+ @ 7:005fe5914f78@default(draft) adda
|
- | o 5:ab8cbb6d87ff@default(draft) addb
+ | o 5:22619daeed78@default(draft) addb
| |
| | o 3:7a7552255fb5@default(draft) addc
| | |
- | | o 2:ef23d6ef94d6@default(draft) addb
+ | | x 2:ef23d6ef94d6@default(draft) addb
| |/
- | o 1:93418d2c0979@default(draft) adda
+ | x 1:93418d2c0979@default(draft) adda
|/
o 0:c471ef929e6a@default(draft) addroot
Test stabilizing a predecessor child
- $ hg stabilize -v
+ $ hg evolve -v
move:[5] addb
atop:[7] adda
- hg rebase -Dr ab8cbb6d87ff -d f5ff10856e5a
+ hg rebase -r 22619daeed78 -d 005fe5914f78
resolving manifests
getting b
b
$ glog
- @ 8:6bf44048e43f@default(draft) addb
+ @ 8:bede829dd2d3@default(draft) addb
|
- o 7:f5ff10856e5a@default(draft) adda
+ o 7:005fe5914f78@default(draft) adda
|
| o 3:7a7552255fb5@default(draft) addc
| |
- | o 2:ef23d6ef94d6@default(draft) addb
+ | x 2:ef23d6ef94d6@default(draft) addb
| |
- | o 1:93418d2c0979@default(draft) adda
+ | x 1:93418d2c0979@default(draft) adda
|/
o 0:c471ef929e6a@default(draft) addroot
@@ -88,39 +89,40 @@
$ hg up 7
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- $ hg debugsuccessors > successors.old
- $ hg stabilize -v
+ $ hg debugobsolete > successors.old
+ $ hg evolve -v
move:[3] addc
atop:[8] addb
- hg rebase -Dr 7a7552255fb5 -d 6bf44048e43f
+ hg rebase -r 7a7552255fb5 -d bede829dd2d3
resolving manifests
getting b
resolving manifests
getting c
c
- $ hg debugsuccessors > successors.new
+ $ hg debugobsolete > successors.new
$ diff -u successors.old successors.new
--- successors.old* (glob)
+++ successors.new* (glob)
- @@ -1,5 +1,6 @@
- 3a4a591493f8 f5ff10856e5a
- 3ca0ded0dc50 ab8cbb6d87ff
- +7a7552255fb5 5e819fbb0d27
- 93418d2c0979 f5ff10856e5a
- ab8cbb6d87ff 6bf44048e43f
- ef23d6ef94d6 ab8cbb6d87ff
+ @@ -3,3 +3,4 @@
+ 93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 {'date': '* *', 'user': 'test'} (glob)
+ 7a7d76dc97c57751de9e80f61ed2a639bd03cd24 0 {'date': '* *', 'user': 'test'} (glob)
+ 22619daeed78036f80fbd326b6852519c4f0c25e bede829dd2d3b2ae9bf198c23432b250dc964458 0 {'date': '* *', 'user': 'test'} (glob)
+ +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 65095d7d0dd5e4f15503bb7b1f433a5fe9bac052 0 {'date': '* *', 'user': 'test'} (glob)
[1]
+
+
+
$ glog
- @ 9:5e819fbb0d27@default(draft) addc
+ @ 9:65095d7d0dd5@default(draft) addc
|
- o 8:6bf44048e43f@default(draft) addb
+ o 8:bede829dd2d3@default(draft) addb
|
- o 7:f5ff10856e5a@default(draft) adda
+ o 7:005fe5914f78@default(draft) adda
|
o 0:c471ef929e6a@default(draft) addroot
- $ hg stabilize -v
- no unstable changeset
+ $ hg evolve -v
+ no troubled changesets
[1]
Test behaviour with --any
@@ -129,28 +131,28 @@
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo b >> b
$ hg amend
- 1 new unstables changesets
+ 1 new unstable changesets
$ glog
- @ 11:4e7cec6b4afe@default(draft) addb
+ @ 11:036cf654e942@default(draft) addb
|
- | o 9:5e819fbb0d27@default(draft) addc
+ | o 9:65095d7d0dd5@default(draft) addc
| |
- | o 8:6bf44048e43f@default(draft) addb
+ | x 8:bede829dd2d3@default(draft) addb
|/
- o 7:f5ff10856e5a@default(draft) adda
+ o 7:005fe5914f78@default(draft) adda
|
o 0:c471ef929e6a@default(draft) addroot
$ hg up 9
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ hg stabilize -v
- nothing to stabilize here
- (1 unstable changesets, do you want --any ?)
+ $ hg evolve -v
+ nothing to evolve here
+ (1 troubled changesets, do you want --any ?)
[2]
- $ hg stabilize --any -v
+ $ hg evolve --any -v
move:[9] addc
atop:[11] addb
- hg rebase -Dr 5e819fbb0d27 -d 4e7cec6b4afe
+ hg rebase -r 65095d7d0dd5 -d 036cf654e942
resolving manifests
removing c
getting b
@@ -158,14 +160,14 @@
getting c
c
$ glog
- @ 12:24f95816bb21@default(draft) addc
+ @ 12:e99ecf51c867@default(draft) addc
|
- o 11:4e7cec6b4afe@default(draft) addb
+ o 11:036cf654e942@default(draft) addb
|
- o 7:f5ff10856e5a@default(draft) adda
+ o 7:005fe5914f78@default(draft) adda
|
o 0:c471ef929e6a@default(draft) addroot
- $ hg stabilize --any -v
- no unstable changeset
+ $ hg evolve --any -v
+ no troubled changesets
[1]
--- a/tests/test-stabilize-result.t Thu Aug 23 18:09:45 2012 +0200
+++ b/tests/test-stabilize-result.t Thu Jun 26 15:27:25 2014 +0100
@@ -5,7 +5,6 @@
> hgext.rebase=
> hgext.graphlog=
> EOF
- $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
$ glog() {
@@ -13,7 +12,7 @@
> '{rev}:{node|short}@{branch}({phase}) bk:[{bookmarks}] {desc|firstline}\n' "$@"
> }
-Test stabilize removing the changeset being stabilized
+Test evolve removing the changeset being evolved
$ hg init empty
$ cd empty
@@ -28,24 +27,306 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo a >> a
$ hg amend -m changea
- 1 new unstables changesets
- $ hg stabilize -v
+ 1 new unstable changesets
+ $ hg evolve -v
move:[2] changea
atop:[4] changea
- hg rebase -Dr cce2c55b8965 -d 1447e1c4828d
+ hg rebase -r cce2c55b8965 -d fb9d051ec0a4
resolving manifests
$ glog --hidden
- @ 4:1447e1c4828d@default(draft) bk:[changea] changea
+ @ 4:fb9d051ec0a4@default(draft) bk:[changea] changea
|
- | o 3:41ad4fe8c795@default(secret) bk:[] amends 102a90ea7b4a3361e4082ed620918c261189a36a
+ | x 3:c5727dbded3c@default(draft) bk:[] temporary amend commit for 102a90ea7b4a
| |
- | | o 2:cce2c55b8965@default(secret) bk:[] changea
+ | | x 2:cce2c55b8965@default(draft) bk:[] changea
| |/
- | o 1:102a90ea7b4a@default(secret) bk:[] addb
+ | x 1:102a90ea7b4a@default(draft) bk:[] addb
|/
o 0:07f494440405@default(draft) bk:[] adda
- $ hg debugsuccessors
- 102a90ea7b4a 1447e1c4828d
- 41ad4fe8c795 1447e1c4828d
- cce2c55b8965 000000000000
+ $ hg debugobsolete
+ 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 {'date': '* *', 'user': 'test'} (glob)
+ c5727dbded3c3a6877cf60d6bb552a76812cb844 0 {'date': '* *', 'user': 'test'} (glob)
+ cce2c55b896511e0b6e04173c9450ba822ebc740 0 {'date': '* *', 'user': 'test'} (glob)
+
+Test evolve with conflict
+
+ $ ls
+ a
+ b
+ $ hg pdiff a
+ diff -r 07f494440405 a
+ --- a/a * (glob)
+ +++ b/a * (glob)
+ @@ -1,1 +1,2 @@
+ a
+ +a
+ $ echo 'newer a' >> a
+ $ hg ci -m 'newer a'
+ $ hg gdown
+ gdown have been deprecated in favor of previous
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ [4] changea
+ $ echo 'a' > a
+ $ hg amend
+ 1 new unstable changesets
+ $ hg evolve
+ move:[5] newer a
+ atop:[7] changea
+ merging a
+ warning: conflicts during merge.
+ merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ evolve failed!
+ fix conflict and run "hg evolve --continue"
+ abort: unresolved merge conflicts (see hg help resolve)
+ [255]
+ $ hg revert -r 'unstable()' a
+ $ hg diff
+ diff -r 66719795a494 a
+ --- a/a * (glob)
+ +++ b/a * (glob)
+ @@ -1,1 +1,3 @@
+ a
+ +a
+ +newer a
+ $ hg evolve --continue
+ grafting revision 5
+ abort: unresolved merge conflicts (see hg help resolve)
+ [255]
+ $ hg resolve -m a
+ $ hg evolve --continue
+ grafting revision 5
+
+Stabilize of late comer with different parent
+==================================================
+
+(the same parent case is handled in test-evolve.t)
+
+ $ glog
+ @ 8:1cf0aacfd363@default(draft) bk:[] newer a
+ |
+ o 7:66719795a494@default(draft) bk:[changea] changea
+ |
+ o 0:07f494440405@default(draft) bk:[] adda
+
+Add another commit
+
+ $ hg gdown
+ gdown have been deprecated in favor of previous
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ [7] changea
+ $ echo 'c' > c
+ $ hg add c
+ $ hg commit -m 'add c'
+ created new head
+
+Get a successors of 8 on it
+
+ $ hg grab 8
+ ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob)
+
+Add real change to the successors
+
+ $ echo 'babar' >> a
+ $ hg amend
+
+Make precursors public
+
+ $ hg phase --hidden --public 8
+ 1 new bumped changesets
+ $ glog
+ @ 12:(73b15c7566e9|d5c7ef82d003)@default\(draft\) bk:\[\] newer a (re)
+ |
+ o 9:7bc2f5967f5e@default(draft) bk:[] add c
+ |
+ | o 8:1cf0aacfd363@default(public) bk:[] newer a
+ |/
+ o 7:66719795a494@default(public) bk:[changea] changea
+ |
+ o 0:07f494440405@default(public) bk:[] adda
+
+
+Stabilize !
+
+ $ hg evolve --any --dry-run
+ recreate:[12] newer a
+ atop:[8] newer a
+ hg rebase --rev (73b15c7566e9|d5c7ef82d003) --dest 66719795a494; (re)
+ hg update 1cf0aacfd363;
+ hg revert --all --rev (73b15c7566e9|d5c7ef82d003); (re)
+ hg commit --msg "bumped update to %s" (no-eol)
+ $ hg evolve --any
+ recreate:[12] newer a
+ atop:[8] newer a
+ rebasing to destination parent: 66719795a494
+ computing new diff
+ committed as (a7cabd7bd9c2|671b9d7eeaec) (re)
+ $ glog
+ @ 14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re)
+ |
+ | o 9:7bc2f5967f5e@default(draft) bk:[] add c
+ | |
+ o | 8:1cf0aacfd363@default(public) bk:[] newer a
+ |/
+ o 7:66719795a494@default(public) bk:[changea] changea
+ |
+ o 0:07f494440405@default(public) bk:[] adda
+
+
+Stabilize divergenent changesets with same parent
+=================================================
+
+ $ rm a.orig
+ $ hg up 9
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ cat << EOF >> a
+ > flore
+ > arthur
+ > zephir
+ > some
+ > less
+ > conflict
+ > EOF
+ $ hg ci -m 'More addition'
+ $ glog
+ @ 15:3932c176bbaa@default(draft) bk:[] More addition
+ |
+ | o 14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re)
+ | |
+ o | 9:7bc2f5967f5e@default(draft) bk:[] add c
+ | |
+ | o 8:1cf0aacfd363@default(public) bk:[] newer a
+ |/
+ o 7:66719795a494@default(public) bk:[changea] changea
+ |
+ o 0:07f494440405@default(public) bk:[] adda
+
+ $ echo 'babar' >> a
+ $ hg amend
+ $ hg up --hidden 15
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ working directory parent is obsolete!
+ $ mv a a.old
+ $ echo 'jungle' > a
+ $ cat a.old >> a
+ $ rm a.old
+ $ hg amend
+ 2 new divergent changesets
+ $ glog
+ @ 19:eacc9c8240fe@default(draft) bk:[] More addition
+ |
+ | o 17:d2f173e25686@default(draft) bk:[] More addition
+ |/
+ | o 14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re)
+ | |
+ o | 9:7bc2f5967f5e@default(draft) bk:[] add c
+ | |
+ | o 8:1cf0aacfd363@default(public) bk:[] newer a
+ |/
+ o 7:66719795a494@default(public) bk:[changea] changea
+ |
+ o 0:07f494440405@default(public) bk:[] adda
+
+
+Stabilize It
+
+ $ hg evolve -qn --traceback
+ hg update -c eacc9c8240fe &&
+ hg merge d2f173e25686 &&
+ hg commit -m "auto merge resolving conflict between eacc9c8240fe and d2f173e25686"&&
+ hg up -C 3932c176bbaa &&
+ hg revert --all --rev tip &&
+ hg commit -m "`hg log -r eacc9c8240fe --template={desc}`";
+ $ hg evolve -v
+ merge:[19] More addition
+ with: [17] More addition
+ base: [15] More addition
+ merging divergent changeset
+ resolving manifests
+ merging a
+ 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+ amending changeset eacc9c8240fe
+ a
+ copying changeset 283ccd10e2b8 to 7bc2f5967f5e
+ a
+ committed changeset 21:f344982e63c4
+ $ hg st
+ $ glog
+ @ 21:f344982e63c4@default(draft) bk:[] More addition
+ |
+ | o 14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re)
+ | |
+ o | 9:7bc2f5967f5e@default(draft) bk:[] add c
+ | |
+ | o 8:1cf0aacfd363@default(public) bk:[] newer a
+ |/
+ o 7:66719795a494@default(public) bk:[changea] changea
+ |
+ o 0:07f494440405@default(public) bk:[] adda
+
+ $ hg summary
+ parent: 21:f344982e63c4 tip
+ More addition
+ branch: default
+ commit: (clean)
+ update: 2 new changesets, 2 branch heads (merge)
+ $ hg export .
+ # HG changeset patch
+ # User test
+ # Date 0 0
+ # Thu Jan 01 00:00:00 1970 +0000
+ # Node ID f344982e63c462b1e44c0371c804685389e673a9
+ # Parent 7bc2f5967f5e4ed277f60a89b7b04cc5d6407ced
+ More addition
+
+ diff -r 7bc2f5967f5e -r f344982e63c4 a
+ --- a/a Thu Jan 01 00:00:00 1970 +0000
+ +++ b/a Thu Jan 01 00:00:00 1970 +0000
+ @@ -1,1 +1,9 @@
+ +jungle
+ a
+ +flore
+ +arthur
+ +zephir
+ +some
+ +less
+ +conflict
+ +babar
+
+Check conflict during divergence resolution
+-------------------------------------------------
+
+ $ hg up --hidden 15
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ working directory parent is obsolete!
+ $ echo 'gotta break' >> a
+ $ hg amend
+ 2 new divergent changesets
+ $ hg phase 'divergent()'
+ 21: draft
+ 23: draft
+ $ hg evolve -qn
+ hg update -c 36e188246d67 &&
+ hg merge f344982e63c4 &&
+ hg commit -m "auto merge resolving conflict between 36e188246d67 and f344982e63c4"&&
+ hg up -C 3932c176bbaa &&
+ hg revert --all --rev tip &&
+ hg commit -m "`hg log -r 36e188246d67 --template={desc}`";
+ $ hg evolve
+ merge:[23] More addition
+ with: [21] More addition
+ base: [15] More addition
+ merging a
+ warning: conflicts during merge.
+ merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
+ use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
+ abort: merge conflict between several amendments (this is not automated yet)
+ (/!\ You can try:
+ /!\ * manual merge + resolve => new cset X
+ /!\ * hg up to the parent of the amended changeset (which are named W and Z)
+ /!\ * hg revert --all -r X
+ /!\ * hg ci -m "same message as the amended changeset" => new cset Y
+ /!\ * hg kill -n Y W Z
+ )
+ [255]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-touch.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,88 @@
+
+ $ cat >> $HGRCPATH <<EOF
+ > [ui]
+ > logtemplate={rev}:{node|short} {desc}\n
+ > [defaults]
+ > amend=-d "0 0"
+ > [extensions]
+ > hgext.rebase=
+ > EOF
+ $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+
+ $ hg init repo
+ $ cd repo
+ $ echo A > a
+ $ hg add a
+ $ hg commit -m a
+
+Basic usage
+
+ $ hg log -G
+ @ 0:e93df3427f45 a
+
+ $ hg touch .
+ $ hg log -G
+ @ 1:[0-9a-f]{12} a (re)
+
+
+
+Revive usage
+
+ $ echo A > b
+ $ hg add b
+ $ hg commit -m ab --amend
+ $ hg up --hidden 1
+ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ working directory parent is obsolete!
+ $ hg log -G
+ o 3:[0-9a-f]{12} ab (re)
+
+ @ 1:[0-9a-f]{12} a (re)
+
+ $ hg touch .
+ 2 new divergent changesets
+ $ hg log -G
+ @ 4:[0-9a-f]{12} a (re)
+
+ o 3:[0-9a-f]{12} ab (re)
+
+ $ hg prune 3
+ 1 changesets pruned
+
+Duplicate
+
+ $ hg touch --duplicate .
+ $ hg log -G
+ @ 5:[0-9a-f]{12} a (re)
+
+ o 4:[0-9a-f]{12} a (re)
+
+
+Multiple touch
+
+ $ echo C > c
+ $ hg add c
+ $ hg commit -m c
+ $ echo D > d
+ $ hg add d
+ $ hg commit -m d
+ $ hg log -G
+ @ 7:[0-9a-f]{12} d (re)
+ |
+ o 6:[0-9a-f]{12} c (re)
+ |
+ o 5:[0-9a-f]{12} a (re)
+
+ o 4:[0-9a-f]{12} a (re)
+
+ $ hg touch 6:7
+ $ hg log -G
+ @ 9:[0-9a-f]{12} d (re)
+ |
+ o 8:[0-9a-f]{12} c (re)
+ |
+ o 5:[0-9a-f]{12} a (re)
+
+ o 4:[0-9a-f]{12} a (re)
+
+
--- a/tests/test-tutorial.t Thu Aug 23 18:09:45 2012 +0200
+++ b/tests/test-tutorial.t Thu Jun 26 15:27:25 2014 +0100
@@ -1,1 +1,871 @@
-../docs/tutorials/tutorial.t
\ No newline at end of file
+
+Initial setup
+-------------
+
+This Mercurial configuration example is used for testing.
+.. Various setup
+
+ $ cat >> $HGRCPATH << EOF
+ > [ui]
+ > # This is change the default output of log for clear tutorial
+ > logtemplate ="{node|short} ({phase}): {desc}\n"
+ > [diff]
+ > # use "git" diff format, clearer and smarter format
+ > git = 1
+ > [alias]
+ > # "-d '0 0'" means that the new commit will be at January 1st 1970.
+ > # This is used for stable hash during test
+ > # (this tutorial is automatically tested.)
+ > amend = amend -d '0 0'
+ > EOF
+
+ $ hg init local
+ $ cat >> local/.hg/hgrc << EOF
+ > [paths]
+ > remote = ../remote
+ > other = ../other
+ > [ui]
+ > user = Babar the King
+ > EOF
+
+ $ hg init remote
+ $ cat >> remote/.hg/hgrc << EOF
+ > [paths]
+ > local = ../local
+ > [ui]
+ > user = Celestine the Queen
+ > EOF
+
+ $ hg init other
+ $ cat >> other/.hg/hgrc << EOF
+ > [ui]
+ > user = Princess Flore
+ > EOF
+
+
+This tutorial uses the following configuration for Mercurial:
+
+A compact log template with phase data:
+
+ $ hg showconfig ui | grep log
+ ui.logtemplate="{node|short} ({phase}): {desc}\n"
+
+Improved git format diff:
+
+ $ hg showconfig diff
+ diff.git=1
+
+And of course, we enable the experimental extensions for mutable history:
+
+ $ cat >> $HGRCPATH <<EOF
+ > [extensions]
+ > evolve = $TESTDIR/../hgext/evolve.py
+ > # enabling rebase is also needed for now
+ > rebase =
+ > EOF
+
+-----------------------
+Single Developer Usage
+-----------------------
+
+This tutorial shows how to use evolution to rewrite history locally.
+
+
+Fixing mistake with `hg amend`
+--------------------------------
+
+We are versionning a shopping list
+
+ $ cd local
+ $ cat >> shopping << EOF
+ > Spam
+ > Whizzo butter
+ > Albatross
+ > Rat (rather a lot)
+ > Jugged fish
+ > Blancmange
+ > Salmon mousse
+ > EOF
+ $ hg commit -A -m "Monthy Python Shopping list"
+ adding shopping
+
+Its first version is shared with the outside.
+
+ $ hg push remote
+ pushing to $TESTTMP/remote
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+
+Later I add additional item to my list
+
+ $ cat >> shopping << EOF
+ > Egg
+ > Suggar
+ > Vinegar
+ > Oil
+ > EOF
+ $ hg commit -m "adding condiment"
+ $ cat >> shopping << EOF
+ > Bananos
+ > Pear
+ > Apple
+ > EOF
+ $ hg commit -m "adding fruit"
+
+This history is very linear
+
+ $ hg log -G
+ @ d85de4546133 (draft): adding fruit
+ |
+ o 4d5dc8187023 (draft): adding condiment
+ |
+ o 7e82d3f3c2cb (public): Monthy Python Shopping list
+
+
+But a typo was made in Babanas!
+
+ $ hg export tip
+ # HG changeset patch
+ # User test
+ # Date 0 0
+ # Thu Jan 01 00:00:00 1970 +0000
+ # Node ID d85de4546133030c82d257bbcdd9b1b416d0c31c
+ # Parent 4d5dc81870237d492284826e21840b2ca00e26d1
+ adding fruit
+
+ diff --git a/shopping b/shopping
+ --- a/shopping
+ +++ b/shopping
+ @@ -9,3 +9,6 @@
+ Suggar
+ Vinegar
+ Oil
+ +Bananos
+ +Pear
+ +Apple
+
+The faulty changeset is in the "draft" phase because it has not been exchanged with
+the outside. The first one has been exchanged and is "public" (immutable).
+
+ $ hg log -G
+ @ d85de4546133 (draft): adding fruit
+ |
+ o 4d5dc8187023 (draft): adding condiment
+ |
+ o 7e82d3f3c2cb (public): Monthy Python Shopping list
+
+
+hopefully. I can use `hg commit --amend` to rewrite my faulty changeset!
+
+ $ sed -i'' -e s/Bananos/Banana/ shopping
+ $ hg diff
+ diff --git a/shopping b/shopping
+ --- a/shopping
+ +++ b/shopping
+ @@ -9,6 +9,6 @@
+ Suggar
+ Vinegar
+ Oil
+ -Bananos
+ +Banana
+ Pear
+ Apple
+ $ hg commit --amend
+
+A new changeset with the right diff replace the wrong one.
+
+ $ hg log -G
+ @ 9d0363b81950 (draft): adding fruit
+ |
+ o 4d5dc8187023 (draft): adding condiment
+ |
+ o 7e82d3f3c2cb (public): Monthy Python Shopping list
+
+ $ hg export tip
+ # HG changeset patch
+ # User test
+ # Date 0 0
+ # Thu Jan 01 00:00:00 1970 +0000
+ # Node ID 9d0363b81950646bc6ad1ec5de8b8197ea586541
+ # Parent 4d5dc81870237d492284826e21840b2ca00e26d1
+ adding fruit
+
+ diff --git a/shopping b/shopping
+ --- a/shopping
+ +++ b/shopping
+ @@ -9,3 +9,6 @@
+ Suggar
+ Vinegar
+ Oil
+ +Banana
+ +Pear
+ +Apple
+
+Getting rid of branchy history
+----------------------------------
+
+While I was working on my list. someone made a change remotly.
+
+ $ cd ../remote
+ $ hg up -q
+ $ sed -i'' -e 's/Spam/Spam Spam Spam/' shopping
+ $ hg ci -m 'SPAM'
+ $ cd ../local
+
+I'll get this remote changeset when pulling
+
+ $ hg pull remote
+ pulling from $TESTTMP/remote
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files (+1 heads)
+ OBSEXC: pull obsolescence markers
+ OBSEXC: no unknown remote markers
+ OBSEXC: DONE
+ (run 'hg heads' to see heads, 'hg merge' to merge)
+
+I now have a new heads. Note that this remote head is immutable
+
+ $ hg log -G
+ o 9ca060c80d74 (public): SPAM
+ |
+ | @ 9d0363b81950 (draft): adding fruit
+ | |
+ | o 4d5dc8187023 (draft): adding condiment
+ |/
+ o 7e82d3f3c2cb (public): Monthy Python Shopping list
+
+
+instead of merging my head with the new one. I'm going to rebase my work
+
+ $ hg diff
+ $ hg rebase --dest 9ca060c80d74 --source 4d5dc8187023
+ merging shopping
+ merging shopping
+
+
+My local work is now rebased on the remote one.
+
+ $ hg log -G
+ @ 41aff6a42b75 (draft): adding fruit
+ |
+ o dfd3a2d7691e (draft): adding condiment
+ |
+ o 9ca060c80d74 (public): SPAM
+ |
+ o 7e82d3f3c2cb (public): Monthy Python Shopping list
+
+
+Removing changesets
+------------------------
+
+I add new item to my list
+
+ $ cat >> shopping << EOF
+ > car
+ > bus
+ > plane
+ > boat
+ > EOF
+ $ hg ci -m 'transport'
+ $ hg log -G
+ @ 1125e39fbf21 (draft): transport
+ |
+ o 41aff6a42b75 (draft): adding fruit
+ |
+ o dfd3a2d7691e (draft): adding condiment
+ |
+ o 9ca060c80d74 (public): SPAM
+ |
+ o 7e82d3f3c2cb (public): Monthy Python Shopping list
+
+
+I have a new commit but I realize that don't want it. (transport shop list does
+not fit well in my standard shopping list)
+
+ $ hg prune . # "." is for working directory parent
+ 1 changesets pruned
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ working directory now at 41aff6a42b75
+
+The silly changeset is gone.
+
+ $ hg log -G
+ @ 41aff6a42b75 (draft): adding fruit
+ |
+ o dfd3a2d7691e (draft): adding condiment
+ |
+ o 9ca060c80d74 (public): SPAM
+ |
+ o 7e82d3f3c2cb (public): Monthy Python Shopping list
+
+
+Reordering changesets
+------------------------
+
+
+We create two changesets.
+
+
+ $ cat >> shopping << EOF
+ > Shampoo
+ > Toothbrush
+ > ... More bathroom stuff to come
+ > Towel
+ > Soap
+ > EOF
+ $ hg ci -m 'bathroom stuff' -q # XXX remove the -q
+
+ $ sed -i'' -e 's/Spam/Spam Spam Spam/g' shopping
+ $ hg ci -m 'SPAM SPAM'
+ $ hg log -G
+ @ fac207dec9f5 (draft): SPAM SPAM
+ |
+ o 10b8aeaa8cc8 (draft): bathroom stuff
+ |
+ o 41aff6a42b75 (draft): adding fruit
+ |
+ o dfd3a2d7691e (draft): adding condiment
+ |
+ o 9ca060c80d74 (public): SPAM
+ |
+ o 7e82d3f3c2cb (public): Monthy Python Shopping list
+
+
+.. note:: We can't amend changeset 7e82d3f3c2cb or 9ca060c80d74 as they are immutable.
+
+ I now want to push to remote all my changes except the bathroom one, which I'm
+ not totally happy with yet. To be able to push "SPAM SPAM" I need a version of
+ "SPAM SPAM" which is not a child of "bathroom stuff"
+
+You can use the 'grab' alias for that.
+
+.. note: grab is an alias for `hg rebase --dest . --rev <target>; hg up <there>`
+
+ $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg grab fac207dec9f5 # moving "SPAM SPAM" to the working directory parent
+ merging shopping
+ ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob)
+ $ hg log -G
+ @ a224f2a4fb9f (draft): SPAM SPAM
+ |
+ | o 10b8aeaa8cc8 (draft): bathroom stuff
+ |/
+ o 41aff6a42b75 (draft): adding fruit
+ |
+ o dfd3a2d7691e (draft): adding condiment
+ |
+ o 9ca060c80d74 (public): SPAM
+ |
+ o 7e82d3f3c2cb (public): Monthy Python Shopping list
+
+
+We have a new SPAM SPAM version without the bathroom stuff
+
+ $ grep Spam shopping # enough spam
+ Spam Spam Spam Spam Spam Spam Spam Spam Spam
+ $ grep Toothbrush shopping # no Toothbrush
+ [1]
+ $ hg export .
+ # HG changeset patch
+ # User test
+ # Date 0 0
+ # Thu Jan 01 00:00:00 1970 +0000
+ # Node ID a224f2a4fb9f9f828f608959912229d7b38b26de
+ # Parent 41aff6a42b7578ec7ec3cb2041633f1ca43cca96
+ SPAM SPAM
+
+ diff --git a/shopping b/shopping
+ --- a/shopping
+ +++ b/shopping
+ @@ -1,4 +1,4 @@
+ -Spam Spam Spam
+ +Spam Spam Spam Spam Spam Spam Spam Spam Spam
+ Whizzo butter
+ Albatross
+ Rat (rather a lot)
+
+To make sure I do not push unready changeset by mistake I set the "bathroom
+stuff" changeset in the secret phase.
+
+ $ hg phase --force --secret 10b8aeaa8cc8
+
+we can now push our change:
+
+ $ hg push remote
+ pushing to $TESTTMP/remote
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 3 changesets with 3 changes to 1 files
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 5 nodes
+ OBSEXC: pushing 6 markers (487 bytes)
+ OBSEXC: DONE
+
+for simplicity sake we get the bathroom change in line again
+
+ $ hg grab 10b8aeaa8cc8
+ merging shopping
+ ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob)
+ $ hg phase --draft .
+ $ hg log -G
+ @ 75954b8cd933 (draft): bathroom stuff
+ |
+ o a224f2a4fb9f (public): SPAM SPAM
+ |
+ o 41aff6a42b75 (public): adding fruit
+ |
+ o dfd3a2d7691e (public): adding condiment
+ |
+ o 9ca060c80d74 (public): SPAM
+ |
+ o 7e82d3f3c2cb (public): Monthy Python Shopping list
+
+
+
+
+Splitting change
+------------------
+
+This part is not written yet, but you can use either the `histedit` extension
+of the `uncommit` command to splitting a change.
+
+ $ hg help uncommit
+ hg uncommit [OPTION]... [NAME]
+
+ move changes from parent revision to working directory
+
+ Changes to selected files in the checked out revision appear again as
+ uncommitted changed in the working directory. A new revision without the
+ selected changes is created, becomes the checked out revision, and
+ obsoletes the previous one.
+
+ The --include option specifies patterns to uncommit. The --exclude option
+ specifies patterns to keep in the commit.
+
+ Return 0 if changed files are uncommitted.
+
+ options:
+
+ -a --all uncommit all changes when no arguments given
+ -I --include PATTERN [+] include names matching the given patterns
+ -X --exclude PATTERN [+] exclude names matching the given patterns
+
+ [+] marked option can be specified multiple times
+
+ use "hg -v help uncommit" to show the global options
+
+
+The edit command of histedit can be used to split changeset:
+
+
+Collapsing change
+------------------
+
+The tutorial part is not written yet but can use `hg fold`:
+
+ $ hg help fold
+ hg fold rev
+
+ aliases: squash
+
+ Fold multiple revisions into a single one
+
+ The revisions from your current working directory to the given one are
+ folded into a single successor revision.
+
+ you can alternatively use --rev to explicitly specify revisions to be
+ folded, ignoring the current working directory parent.
+
+ options:
+
+ -r --rev VALUE [+] explicitly specify the full set of revision to fold
+ -m --message TEXT use text as commit message
+ -l --logfile FILE read commit message from file
+ -d --date DATE record the specified date as commit date
+ -u --user USER record the specified user as committer
+
+ [+] marked option can be specified multiple times
+
+ use "hg -v help fold" to show the global options
+
+
+-----------------------
+Collaboration
+-----------------------
+
+
+sharing mutable changesets
+----------------------------
+
+To share mutable changesets with others, just check that the repo you interact
+with is "not publishing". Otherwise you will get the previously observe
+behavior where exchanged changeset are automatically published.
+
+ $ cd ../remote
+ $ hg -R ../local/ showconfig phases
+
+the localrepo does not have any specific configuration for `phases.publish`. It
+is ``true`` by default.
+
+ $ hg pull local
+ pulling from $TESTTMP/local
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (560 bytes)
+ OBSEXC: 1 markers added
+ OBSEXC: DONE
+ (run 'hg update' to get a working copy)
+ $ hg log -G
+ o 75954b8cd933 (public): bathroom stuff
+ |
+ o a224f2a4fb9f (public): SPAM SPAM
+ |
+ o 41aff6a42b75 (public): adding fruit
+ |
+ o dfd3a2d7691e (public): adding condiment
+ |
+ @ 9ca060c80d74 (public): SPAM
+ |
+ o 7e82d3f3c2cb (public): Monthy Python Shopping list
+
+
+
+
+We do not want to publish the "bathroom changeset". Let's rollback the last transaction.
+
+.. Warning: Rollback is actually a dangerous kind of internal command that is deprecated and should not be exposed to user. Please forget you read about it until someone fix this tutorial.
+
+ $ hg rollback
+ repository tip rolled back to revision 4 (undo pull)
+ $ hg log -G
+ o a224f2a4fb9f (public): SPAM SPAM
+ |
+ o 41aff6a42b75 (public): adding fruit
+ |
+ o dfd3a2d7691e (public): adding condiment
+ |
+ @ 9ca060c80d74 (public): SPAM
+ |
+ o 7e82d3f3c2cb (public): Monthy Python Shopping list
+
+
+Let's make the local repo "non publishing"
+
+ $ echo '[phases]' >> ../local/.hg/hgrc
+ $ echo 'publish=false' >> ../local/.hg/hgrc
+ $ echo '[phases]' >> .hg/hgrc
+ $ echo 'publish=false' >> .hg/hgrc
+ $ hg showconfig phases
+ phases.publish=false
+ $ hg -R ../local/ showconfig phases
+ phases.publish=false
+
+
+I can now exchange mutable changeset between "remote" and "local" repository.
+
+ $ hg pull local
+ pulling from $TESTTMP/local
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (560 bytes)
+ OBSEXC: 1 markers added
+ OBSEXC: DONE
+ (run 'hg update' to get a working copy)
+ $ hg log -G
+ o 75954b8cd933 (draft): bathroom stuff
+ |
+ o a224f2a4fb9f (public): SPAM SPAM
+ |
+ o 41aff6a42b75 (public): adding fruit
+ |
+ o dfd3a2d7691e (public): adding condiment
+ |
+ @ 9ca060c80d74 (public): SPAM
+ |
+ o 7e82d3f3c2cb (public): Monthy Python Shopping list
+
+
+Rebasing unstable change after pull
+----------------------------------------------
+
+Remotely someone add a new changeset on top of the mutable "bathroom" on.
+
+ $ hg up 75954b8cd933 -q
+ $ cat >> shopping << EOF
+ > Giraffe
+ > Rhino
+ > Lion
+ > Bear
+ > EOF
+ $ hg ci -m 'animals'
+
+But at the same time, locally, this same "bathroom changeset" was updated.
+
+ $ cd ../local
+ $ hg up 75954b8cd933 -q
+ $ sed -i'' -e 's/... More bathroom stuff to come/Bath Robe/' shopping
+ $ hg commit --amend
+ $ hg log -G
+ @ a44c85f957d3 (draft): bathroom stuff
+ |
+ o a224f2a4fb9f (public): SPAM SPAM
+ |
+ o 41aff6a42b75 (public): adding fruit
+ |
+ o dfd3a2d7691e (public): adding condiment
+ |
+ o 9ca060c80d74 (public): SPAM
+ |
+ o 7e82d3f3c2cb (public): Monthy Python Shopping list
+
+
+
+When we pull from remote again we get an unstable state!
+
+ $ hg pull remote
+ pulling from $TESTTMP/remote
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files (+1 heads)
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (560 bytes)
+ OBSEXC: 0 markers added
+ OBSEXC: DONE
+ (run 'hg heads' to see heads, 'hg merge' to merge)
+ 1 new unstable changesets
+
+
+The new changeset "animal" is based on an old changeset of "bathroom". You can
+see both version showing up in the log.
+
+ $ hg log -G
+ o bf1b0d202029 (draft): animals
+ |
+ | @ a44c85f957d3 (draft): bathroom stuff
+ | |
+ x | 75954b8cd933 (draft): bathroom stuff
+ |/
+ o a224f2a4fb9f (public): SPAM SPAM
+ |
+ o 41aff6a42b75 (public): adding fruit
+ |
+ o dfd3a2d7691e (public): adding condiment
+ |
+ o 9ca060c80d74 (public): SPAM
+ |
+ o 7e82d3f3c2cb (public): Monthy Python Shopping list
+
+
+The older version 75954b8cd933 never ceased to exist in the local repo. It was
+just hidden and excluded from pull and push.
+
+.. note:: In hgview there is a nice dotted relation highlighting a44c85f957d3 as a new version of 75954b8cd933. this is not yet ported to ``hg log -G``.
+
+There is now an **unstable** changeset in this history. Mercurial will refuse to
+share it with the outside:
+
+ $ hg push other
+ pushing to $TESTTMP/other
+ searching for changes
+ abort: push includes unstable changeset: bf1b0d202029!
+ (use 'hg evolve' to get a stable history or --force to ignore warnings)
+ [255]
+
+
+
+
+To resolve this unstable state, you need to rebase bf1b0d202029 onto
+a44c85f957d3. The `hg evolve` command will do this for you.
+
+It has a --dry-run option to only suggest the next move.
+
+ $ hg evolve --dry-run
+ move:[15] animals
+ atop:[14] bathroom stuff
+ hg rebase -r bf1b0d202029 -d a44c85f957d3
+
+Let's do it
+
+ $ hg evolve
+ move:[15] animals
+ atop:[14] bathroom stuff
+ merging shopping
+
+The old version of bathroom is hidden again.
+
+ $ hg log -G
+ @ ee942144f952 (draft): animals
+ |
+ o a44c85f957d3 (draft): bathroom stuff
+ |
+ o a224f2a4fb9f (public): SPAM SPAM
+ |
+ o 41aff6a42b75 (public): adding fruit
+ |
+ o dfd3a2d7691e (public): adding condiment
+ |
+ o 9ca060c80d74 (public): SPAM
+ |
+ o 7e82d3f3c2cb (public): Monthy Python Shopping list
+
+
+
+We can push this evolution to remote
+
+ $ hg push remote
+ pushing to $TESTTMP/remote
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 2 changesets with 2 changes to 1 files (+1 heads)
+ OBSEXC: computing relevant nodes
+ OBSEXC: computing markers relevant to 7 nodes
+ OBSEXC: pushing 10 markers (803 bytes)
+ OBSEXC: DONE
+
+remote get a warning that current working directory is based on an obsolete changeset
+
+ $ cd ../remote
+ $ hg pull local # we up again to trigger the warning. it was displayed during the push
+ pulling from $TESTTMP/local
+ searching for changes
+ no changes found
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (803 bytes)
+ OBSEXC: 0 markers added
+ OBSEXC: DONE
+ working directory parent is obsolete!
+
+now let's see where we are, and update to the successor
+
+ $ hg parents
+ bf1b0d202029 (draft): animals
+ working directory parent is obsolete!
+ $ hg evolve
+ update:[8] animals
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+Relocating unstable change after prune
+----------------------------------------------
+
+The remote guy keep working
+
+ $ sed -i'' -e 's/Spam/Spam Spam Spam Spam/g' shopping
+ $ hg commit -m "SPAM SPAM SPAM"
+
+I'm pulling its work locally.
+
+ $ cd ../local
+ $ hg pull remote
+ pulling from $TESTTMP/remote
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
+ OBSEXC: pull obsolescence markers
+ OBSEXC: merging obsolescence markers (803 bytes)
+ OBSEXC: 0 markers added
+ OBSEXC: DONE
+ (run 'hg update' to get a working copy)
+ $ hg log -G
+ o 99f039c5ec9e (draft): SPAM SPAM SPAM
+ |
+ @ ee942144f952 (draft): animals
+ |
+ o a44c85f957d3 (draft): bathroom stuff
+ |
+ o a224f2a4fb9f (public): SPAM SPAM
+ |
+ o 41aff6a42b75 (public): adding fruit
+ |
+ o dfd3a2d7691e (public): adding condiment
+ |
+ o 9ca060c80d74 (public): SPAM
+ |
+ o 7e82d3f3c2cb (public): Monthy Python Shopping list
+
+
+In the mean time I noticed you can't buy animals in a super market and I prune the animal changeset:
+
+ $ hg prune ee942144f952
+ 1 changesets pruned
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ working directory now at a44c85f957d3
+ 1 new unstable changesets
+
+
+The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset
+is neither dead or obsolete. My repository is in an unstable state again.
+
+ $ hg log -G
+ o 99f039c5ec9e (draft): SPAM SPAM SPAM
+ |
+ x ee942144f952 (draft): animals
+ |
+ @ a44c85f957d3 (draft): bathroom stuff
+ |
+ o a224f2a4fb9f (public): SPAM SPAM
+ |
+ o 41aff6a42b75 (public): adding fruit
+ |
+ o dfd3a2d7691e (public): adding condiment
+ |
+ o 9ca060c80d74 (public): SPAM
+ |
+ o 7e82d3f3c2cb (public): Monthy Python Shopping list
+
+
+ $ hg log -r 'unstable()'
+ 99f039c5ec9e (draft): SPAM SPAM SPAM
+
+ $ hg evolve
+ move:[17] SPAM SPAM SPAM
+ atop:[14] bathroom stuff
+ merging shopping
+
+ $ hg log -G
+ @ 40aa40daeefb (draft): SPAM SPAM SPAM
+ |
+ o a44c85f957d3 (draft): bathroom stuff
+ |
+ o a224f2a4fb9f (public): SPAM SPAM
+ |
+ o 41aff6a42b75 (public): adding fruit
+ |
+ o dfd3a2d7691e (public): adding condiment
+ |
+ o 9ca060c80d74 (public): SPAM
+ |
+ o 7e82d3f3c2cb (public): Monthy Python Shopping list
+
+
+
+Handling Divergent amend
+----------------------------------------------
+
+We can detect that multiple diverging amendments have been made.
+The `evolve` command can solve this situation. But all corner case are not
+handled now.
+
+This section needs to be written.
--- a/tests/test-uncommit.t Thu Aug 23 18:09:45 2012 +0200
+++ b/tests/test-uncommit.t Thu Jun 26 15:27:25 2014 +0100
@@ -3,7 +3,6 @@
> hgext.rebase=
> hgext.graphlog=
> EOF
- $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
$ glog() {
@@ -220,7 +219,7 @@
$ glog --hidden
@ 4:e8db4aa611f6@bar(stable/draft) touncommit
|
- | o 3:5eb72dbe0cb4@bar(extinct/secret) touncommit
+ | x 3:5eb72dbe0cb4@bar(extinct/draft) touncommit
|/
o 2:f63b90038565@default(stable/draft) merge
|\
@@ -232,17 +231,17 @@
* touncommit-bm 4:e8db4aa611f6
touncommit-bm-inactive 4:e8db4aa611f6
unrelated 2:f63b90038565
- $ hg debugsuccessors
- 5eb72dbe0cb4 e8db4aa611f6
+ $ hg debugobsolete
+ 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 {'date': '* *', 'user': 'test'} (glob)
Test phase is preserved, no local changes
- $ hg up -C 3
+ $ hg up -C 3 --hidden
8 files updated, 0 files merged, 1 files removed, 0 files unresolved
- Working directory parent is obsolete
+ working directory parent is obsolete!
$ hg --config extensions.purge= purge
$ hg uncommit -I 'set:added() and e'
- 2 new conflictings changesets
+ 2 new divergent changesets
$ hg st --copies
A e
$ hg st --copies --change .
@@ -263,11 +262,11 @@
R m
R n
$ glog --hidden
- @ 5:c706fe2c12f8@bar(stable/secret) touncommit
+ @ 5:c706fe2c12f8@bar(stable/draft) touncommit
|
| o 4:e8db4aa611f6@bar(stable/draft) touncommit
|/
- | o 3:5eb72dbe0cb4@bar(extinct/secret) touncommit
+ | x 3:5eb72dbe0cb4@bar(extinct/draft) touncommit
|/
o 2:f63b90038565@default(stable/draft) merge
|\
@@ -275,18 +274,18 @@
|
o 0:07f494440405@default(stable/draft) adda
- $ hg debugsuccessors
- 5eb72dbe0cb4 c706fe2c12f8
- 5eb72dbe0cb4 e8db4aa611f6
+ $ hg debugobsolete
+ 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 {'date': '* *', 'user': 'test'} (glob)
+ 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c706fe2c12f83ba5010cb60ea6af3bd1f0c2d6d3 0 {'date': '* *', 'user': 'test'} (glob)
Test --all
- $ hg up -C 3
+ $ hg up -C 3 --hidden
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
- Working directory parent is obsolete
+ working directory parent is obsolete!
$ hg --config extensions.purge= purge
$ hg uncommit --all -X e
- 1 new conflictings changesets
+ 1 new divergent changesets
$ hg st --copies
M b
M d
@@ -308,29 +307,29 @@
$ hg st --copies --change .
A e
- $ hg debugsuccessors
- 5eb72dbe0cb4 c4cbebac3751
- 5eb72dbe0cb4 c706fe2c12f8
- 5eb72dbe0cb4 e8db4aa611f6
+ $ hg debugobsolete
+ 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 {'date': '* *', 'user': 'test'} (glob)
+ 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c706fe2c12f83ba5010cb60ea6af3bd1f0c2d6d3 0 {'date': '* *', 'user': 'test'} (glob)
+ 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 {'date': '* *', 'user': 'test'} (glob)
Display a warning if nothing left
$ hg uncommit e
new changeset is empty
- (use "hg kill ." to remove it)
- $ hg debugsuccessors
- 5eb72dbe0cb4 c4cbebac3751
- 5eb72dbe0cb4 c706fe2c12f8
- 5eb72dbe0cb4 e8db4aa611f6
- c4cbebac3751 4f1c269eab68
+ (use "hg prune ." to remove it)
+ $ hg debugobsolete
+ 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 {'date': '* *', 'user': 'test'} (glob)
+ 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c706fe2c12f83ba5010cb60ea6af3bd1f0c2d6d3 0 {'date': '* *', 'user': 'test'} (glob)
+ 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 {'date': '* *', 'user': 'test'} (glob)
+ c4cbebac3751269bdf12d1466deabcc78521d272 4f1c269eab68720f54e88ce3c1dc02b2858b6b89 0 {'date': '* *', 'user': 'test'} (glob)
Test instability warning
$ hg ci -m touncommit
$ echo unrelated > unrelated
$ hg ci -Am addunrelated unrelated
- $ hg gdown
+ $ hg previous
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
[8] touncommit
$ hg uncommit aa
- 1 new unstables changesets
+ 1 new unstable changesets
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-wireproto.t Thu Jun 26 15:27:25 2014 +0100
@@ -0,0 +1,127 @@
+
+ $ cat >> $HGRCPATH <<EOF
+ > [defaults]
+ > amend=-d "0 0"
+ > [ui]
+ > ssh=python "$TESTDIR/dummyssh"
+ > [phases]
+ > publish = False
+ > [extensions]
+ > hgext.rebase=
+ > EOF
+ $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
+
+ $ mkcommit() {
+ > echo "$1" > "$1"
+ > hg add "$1"
+ > hg ci -m "add $1"
+ > }
+
+setup repo
+
+ $ hg init server
+
+ $ hg clone ssh://user@dummy/server client
+ no changes found
+ OBSEXC: pull obsolescence markers
+ OBSEXC: looking for common markers in 0 nodes
+ OBSEXC: no unknown remote markers
+ OBSEXC: DONE
+ updating to branch default
+ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ cp -r client other
+
+Smoke testing
+===============
+
+ $ cd client
+ $ mkcommit 0
+ $ mkcommit a
+ $ hg push
+ pushing to ssh://user@dummy/server
+ searching for changes
+ remote: adding changesets
+ remote: adding manifests
+ remote: adding file changes
+ remote: added 2 changesets with 2 changes to 2 files
+ $ hg pull
+ pulling from ssh://user@dummy/server
+ searching for changes
+ no changes found
+ OBSEXC: pull obsolescence markers
+ OBSEXC: looking for common markers in 2 nodes
+ OBSEXC: no unknown remote markers
+ OBSEXC: DONE
+ $ hg pull -R ../other
+ pulling from ssh://user@dummy/server
+ requesting all changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 2 changesets with 2 changes to 2 files
+ OBSEXC: pull obsolescence markers
+ OBSEXC: looking for common markers in 2 nodes
+ OBSEXC: no unknown remote markers
+ OBSEXC: DONE
+ (run 'hg update' to get a working copy)
+ $ hg push -R ../other
+ pushing to ssh://user@dummy/server
+ searching for changes
+ no changes found
+ [1]
+
+Push
+=============
+
+ $ echo 'A' > a
+ $ hg amend
+ $ hg push
+ pushing to ssh://user@dummy/server
+ searching for changes
+ OBSEXC: computing relevant nodes
+ OBSEXC: looking for common markers in 2 nodes
+ OBSEXC: computing markers relevant to 1 nodes
+ OBSEXC: pushing 2 markers (171 bytes)
+ OBSEXC: DONE
+ remote: adding changesets
+ remote: adding manifests
+ remote: adding file changes
+ remote: added 1 changesets with 1 changes to 1 files (+1 heads)
+ $ hg push
+ pushing to ssh://user@dummy/server
+ searching for changes
+ no changes found
+ OBSEXC: computing relevant nodes
+ OBSEXC: looking for common markers in [23] nodes (re)
+ OBSEXC: markers already in sync
+ OBSEXC: no marker to push
+ OBSEXC: DONE
+ [1]
+
+Pull
+=============
+
+ $ hg -R ../other pull
+ pulling from ssh://user@dummy/server
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
+ OBSEXC: pull obsolescence markers
+ OBSEXC: looking for common markers in [23] nodes (re)
+ OBSEXC: merging obsolescence markers (171 bytes)
+ OBSEXC: 2 markers added
+ OBSEXC: DONE
+ (run 'hg heads' to see heads)
+ $ hg -R ../other pull
+ pulling from ssh://user@dummy/server
+ searching for changes
+ no changes found
+ OBSEXC: pull obsolescence markers
+ OBSEXC: looking for common markers in [23] nodes (re)
+ OBSEXC: no unknown remote markers
+ OBSEXC: DONE
+
+ $ cd ..
+