Cyril Plisko wrote:
On 10/19/06, Stephen Lau <[EMAIL PROTECTED]> wrote:
The problem is Teamware "undo" operations remove the changeset entirely.
This breaks anyone who has updated/pulled/cloned the now-removed
changeset since their history doesn't line up with the canonical gate's
history.
I've worked around it by mapping "undo" => "hg backout" which applies a
reverse patch, but this means the history isn't 100% consistent with the
Teamware history now.
I think "hg strip" may do the job instead of "hg backout".
No. In this case 'hg strip' would be identical to 'hg rollback && hg
revert'. (except strip needs a revision as an argument)
The problem with this, is that if someone has already brought over the
change you are about to vaporize, they need then need to do small
amounts of manual surgery to make their workspace remain valid:
At best, yes, 'hg strip' that delta, at worst:
1. export any local changes checked in on top of the bad delta.
2. strip the parent of the bad delta (such that both the bad delta, and
a second head caused by another 'pull' are removed).
3. hg pull -u, to bring yourself back to the real 'tip'
4. re-apply the changes from step 1
-- Rich
_______________________________________________
tools-discuss mailing list
tools-discuss@opensolaris.org
