Message11362

Author pmezard
Recipients danchr, djc
Date 2010-01-03.12:28:59
Content
I cannot find any major release doing this right down to 1.0.

Here is the relevant graph portion:

o    changeset:   10195:1139fcfeaeda
|\   parent:      10192:8161127a638f
| |  parent:      10194:a275c3997e03
| |  user:        Matt Mackall <mpm@selenic.com>
| |  date:        Fri Jan 01 18:10:10 2010 -0600
| |  summary:     Merge with stable
| |
| @  changeset:   10194:a275c3997e03
| |  branch:      stable
| |  user:        Matt Mackall <mpm@selenic.com>
| |  date:        Fri Jan 01 17:58:35 2010 -0600
| |  summary:     Added signature for changeset 296a0b14a686
| |
.


ui.py is merge with both other and common ancestor set to the filelog
version in a275c3997e03. The merge works if 1139fcfeaeda is used a common
ancestor instead.
History
Date User Action Args
2010-01-03 12:29:00pmezardsetmessageid: <1262521740.08.0.174617232841.issue1966@mercurial.selenic.com>
2010-01-03 12:29:00pmezardsetrecipients: + djc, danchr
2010-01-03 12:29:00pmezardlinkissue1966 messages
2010-01-03 12:28:59pmezardcreate