merge problem after reverting a bad merge

[Steve Borho]

On Wed, Apr 14, 2010 at 5:08 AM, StupidGirl <shamima17 at yahoo.com> wrote:
>
> I had a bad merge.  I have tried to revert to a chageset before the merge and
> did a commit after that. Now I am trying to add a bundle for the merge.
>
> But I`m getting the message
> c:\Documents and Settings\Shamima\Desktop\New
> Folder\test_rev94_to_tip_hg\test_rev94_to_tip.hg
> searching for changes
> no changes found
> [command completed successfully Tue Apr 13 16:10:37 2010]
>
> What have I missed after the revert? Why can`t it see the changes?
> How can I add the new changes?

I'm confused by your workflow.  The normal way to re-do a merge is to
"update" to the original parent revision and then restart the merge
with the second parent, do the merge, test, then commit.

Once you're happy with the new merge, you can clone -r <goodmerge> to
remove the bad merge.
(Or if you're used to using MQ, you can strip it).

Reverts and bundles are not normally involved.

--
Steve Borho