Mercurial 1.7 released!

[Matt Mackall]

On Wed, 2010-11-03 at 23:13 +0200, Stanimir Stamenkov wrote:
> Mon, 01 Nov 2010 17:50:48 -0500, /Matt Mackall/:
> 
> > Full details here:
> >
> > http://mercurial.selenic.com/wiki/WhatsNew
> 
> > 1.2. Commands
> >     ...
> >     * merge: don't detect copies as "divergent renames", make error
> > message more helpful
> >     ...
> 
> Could some give a reference explaining this in a bit more detail? 

If Alice renames foo to bar, and Bob simultaneously renames foo to baz,
then merges with Alice, Bob gets a "diverent rename" warning rather than
a conflict.

In 1.7, we (a) only give this warning for renames, not copies and (b)
we've made the message a bit different:

note: possible conflict - foo was renamed multiple times to:
 bar
 baz

> Does this mean true/full renames will not be "followed" when merging 
> or does it mean just simple copies (w/o having the original deleted) 
> will not be followed when merging, or?

Normal behavior for copies and renames continues as always, only the
warning message for one corner case has changed. If you've never seen
this warning, then all is as before.

-- 
Mathematics is the supreme nostalgia of our time.