Message11539

Author mpm
Recipients abuehl, astratto, djc, mg, pmezard, tonfa
Date 2010-01-29.19:03:08
Content
This is definitely specific to rebase and how it fiddles with ancestry. The
patch that fixes your rebase case breaks a bunch of tests in the test suite.

Also, in your test case, this should -not- appear:

  local changed dd/a which remote deleted
 use (c)hanged version or (d)elete? c

..because remote didn't delete the file, it renamed it. The new code detects
the rename(!), but detects it as being a divergent rename (both sides
renaming it from its original name) because it's not following the "virtual
history" that rebase tries to impose on the merge.
History
Date User Action Args
2010-01-29 19:03:08mpmsetmessageid: <1264791788.3.0.237975427221.issue1994@mercurial.selenic.com>
2010-01-29 19:03:08mpmsetrecipients: + tonfa, pmezard, mg, djc, abuehl, astratto
2010-01-29 19:03:08mpmlinkissue1994 messages
2010-01-29 19:03:08mpmcreate