Avoiding massive merges

[hg user]

Let's see if I understand correctly:
you had repository for branch 3.0.4 with a branch,
when you started working on 3.1 you cloned the 3.0.4 repos and you got the
branch that is useless (because 3.0.4 is on antoher repository) and so you
"just" need to delete the branch....

If files are the same in 4 and b (in names and numbers, not in
contents.....) why ddon't you:
checkout the branch rev b in a dir
checkout the rev 4 in another dir
copy from "4" over "b"
commit b (it becames c)
and then merge 4 and C that are now equal so no mess in merging....

And now I also start to understand the proposed HGMERGE = true .... you are
not merging but just want to lose the changes..... I will study solutions
other people proposed

Francesco
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20070908/539c65b9/attachment.htm