Mercurial > evolve
comparison docs/conf.py @ 1589:d6630a6bff86
touch: prompt the user for what to do with the revived changeset
This patch improves our interface for reviving changesets.
This patch makes touch not assume that the user wants to create divergence by
default and gives a prompt instead. The prompt is skipped for changeset that
have no living successor as no divergence would be created by reviving them
anyway.
To restore the previous behavior, one should now use the --allowdivergence flag.
The prompt looks like:
[10] <description>
reviving this changeset will create divergence unless you make a duplicate.
(a)llow divergence or (d)uplicate the changeset? a
In further patches we will want to add one more choice to that prompt, for
example having a marker between the old and revived nodes but no divergence
displayed on the UI.
author | Laurent Charignon <lcharignon@fb.com> |
---|---|
date | Sun, 17 Jan 2016 16:55:40 -0800 |
parents | 34e4e51affd1 |
children | fc6183051112 |
comparison
equal
deleted
inserted
replaced
1588:983f2e4dbe5d | 1589:d6630a6bff86 |
---|