Clobbering merges

[Attila Babo]

On 10/19/07, Yaron Minsky <yminsky at janestcapital.com> wrote:
>
> On Fri, 2007-10-19 at 11:17 -0500, Matt Mackall wrote:
> > On Fri, Oct 19, 2007 at 08:48:26AM -0400, Yaron Minsky wrote:
> > > On Fri, 2007-10-19 at 15:27 +0300, Giorgos Keramidas wrote:
> > > > On 2007-10-18 13:49, Yaron Minsky <yminsky at janestcapital.com> wrote:
> > > > > I work with a group of developers that has recently switched over
> to
> > > > > mercurial, and we've been having some merge-related issues that
> I'm
> > > > > wondering if anyone has insight on.
> > > > >
> > > > > The basic problem is one of clobbering.  Two branches are merged
> > > > > together, and in the merge, the developer mistakenly clobbers
> changes
> > > > > that he had not intended to.
> > > >
> > > > I can't parse the last sentence above.  Are these changes
> *committed*
> > > > changesets?  If yes, how are they clobbered, and why?
> > >
> > > Imagine your history looks like this:
> > >
> > > [1]---[2]
> > >   \___[3]
> > >
> > > Where [3] contains the developers local changes.  The developer then
> > > merges, creating a new changeset [4].
> > >
> > > [1]---[2]---[4]
> > >   \___[3]__/
> > >
> > > But unfortunately, [4] is screwed up so that it just ends up being
> equal
> > > to [3].
> >
> > Is this for a single file or for all files? In most merges, no files
> > are actually in conflict so the external tool is never invoked.
>
> So, I don't really know what happened.  I've cc'd the developer who
> actually performed the clobbering merge (Hi Dale!).  I know kdiff3 was
> involved, and I know that at the end of the merge, changes to a huge
> number of changes to files unrelated to the ones Dale was working on got
> unrolled.  I am very unsure how this happened.


 Blame kdiff3 and try to remove the local preferences! A colleague of mine
had similar experience, while the same merge was fine on a different
machine. We used kdiff3 on both machines, the only difference was somewhere
in his local settings. It's also worth to note that kdiff3 doesn't issue a
warning when you quit without saving your changes, this could lead to a
similar problem.

Attila
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial/attachments/20071020/336b75ba/attachment.htm