Simple merges that shouldn

[John Goerzen]

Hi,

I've had a number of cases of simple merges that shouldn't conflict.
The simplest of these involves merging .hgtags.  I maintain upstream and
Debian branches of some programs.  I place tags both places, and a merge
conflicts on .hgtags every time.

I have assembled a test case (see attached 3k tarbal).  It has two repos
with a few simple patches.

If you pull from ups into deb, and merge, you'll get a conflict on
.hgtags and have to resolve it manually.

However, if you hg export the patch from ups and hg import it into deb,
it will apply fine (with fuzz).  hg transplant also will apply it fine.

What can be done to smarten up merge here?  Will there ever be cases
where it will be smarter than hg import (which seems to use
/usr/bin/patch)?  Right now, merge, diff3, etc. all seem a lot less
intelligent than patch.

Thanks,

-- John

-------------- next part --------------
A non-text attachment was scrubbed...
Name: testcase.tar.gz
Type: application/octet-stream
Size: 3219 bytes
Desc: not available
Url : http://www.selenic.com/pipermail/mercurial/attachments/20070307/e7f6fc1a/testcase.tar.obj