Avoiding massive merges

[John Levon]

On Sat, Sep 08, 2007 at 02:00:44PM +0200, hg user wrote:

> 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....

That might work, but you would have to be extremely careful since you'd
be doing file additions, deletes, renames, etc. by hand. Getting hg to
do it is much preferable

regards
john