docs/qsync.rst
author Greg Ward <greg@gerg.ca>
Thu, 05 Jun 2014 18:07:39 -0400
branchstable
changeset 973 6d691fefdbd1
parent 655 dd5765ae91c3
permissions -rw-r--r--
evolve: fix createmarkers() wrapper to accept an iterable Docstring in mercurial.obsolete says "<relations> must be an iterable of ...", and hgsubversion takes it at its word and passes a generator. Until around Mercurial 3.0, this did not cause any problems, but now it does: in a repo with both evolve and hgsubversion enabled, pushing to Subversion when obsolete changesets are present causes a crash: [...] File "/home/gward/src/hgsubversion/hgsubversion/wrappers.py", line 346, in push obsolete.createmarkers(repo, relations) File "/home/gward/src/hg-stable/mercurial/extensions.py", line 196, in wrap return wrapper(origfn, *args, **kwargs) File "/home/gward/src/hg-evolve/hgext/evolve.py", line 332, in _createmarkers relations[idx] = (prec, sucs, meta) TypeError: 'generator' object does not support item assignment Since hgsubersion is playing by the documented rules, evolve must be the guilty party here.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
519
9825c7da5b54 ensure all file have a copyright notice
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 357
diff changeset
     1
.. Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org>
9825c7da5b54 ensure all file have a copyright notice
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 357
diff changeset
     2
..                Logilab SA        <contact@logilab.fr>
527
b81193ef3488 docs: add missing blank line after Copyright notice
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 519
diff changeset
     3
171
642f07cd9c77 doc: add reference to qsync
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
     4
---------------------------------------------------------------------
642f07cd9c77 doc: add reference to qsync
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
     5
Qsync: Mercurial to MQ exporter
642f07cd9c77 doc: add reference to qsync
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
     6
---------------------------------------------------------------------
642f07cd9c77 doc: add reference to qsync
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
     7
642f07cd9c77 doc: add reference to qsync
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
     8
655
dd5765ae91c3 doc: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents: 527
diff changeset
     9
People may have tools or co-workers that expect to receive mutable history using
dd5765ae91c3 doc: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents: 527
diff changeset
    10
a versioned MQ repository.
171
642f07cd9c77 doc: add reference to qsync
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    11
655
dd5765ae91c3 doc: fix grammar, spelling, punctuation
Greg Ward <greg@gerg.ca>
parents: 527
diff changeset
    12
For this purpose you can use the ``qsync`` extension.
171
642f07cd9c77 doc: add reference to qsync
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    13
642f07cd9c77 doc: add reference to qsync
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    14
642f07cd9c77 doc: add reference to qsync
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    15
To enable the evolve extension use::
642f07cd9c77 doc: add reference to qsync
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    16
642f07cd9c77 doc: add reference to qsync
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    17
    $ hg clone http://hg-dev.octopoid.net/hgwebdir.cgi/mutable-history/
172
9cbb6756485c doc: replace ">" by ">>" (oups)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 171
diff changeset
    18
    $ mutable-history/iqsync-enable.sh >> ~/.hgrc
171
642f07cd9c77 doc: add reference to qsync
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset
    19
    $ hg help qsync