[PATCH 1 of 5] add hgmerge subsystem

[dhruva]

On Feb 1, 2008 10:46 PM, Matt Mackall <mpm at selenic.com> wrote:
>
> On Thu, 2008-01-31 at 22:56 -0600, Steve Borho wrote:
> > +def _setup_plugs(ui):
> > +    def handle_conf(name, plugs):
> > +        for p in plugs:
> > +            if p.name.lower() == name.lower():
>
> a) This is O(n^2)
> b) Do we really want to be case-insensitive?

On platforms that are not case sensitive (M$):
1. If a file in 1 repo has FooBar.txt
2. Clone repo 1 as 2
3. Rename file from FooBar.txt to foobar.txt

Since #3 does not make any sense on M$, when I compare files between
repos (1 & 2), there should be no difference. If a case sensitive diff
is done, it will assume FooBar.txt to be different from foobar.txt.

Please correct me if I am wrong here in understanding the current
behavior of hgmerge (standalone).

-dky

-- 
Contents reflect my personal views only!