Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/cmdutil.py @ 20773:efbf15979538
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 18 Mar 2014 14:25:28 -0500 |
| parents | d5fa413346e7 434619dae569 |
| children | 49f2d5644f04 |
comparison
equal
deleted
inserted
replaced
| 20764:d9378bfa0af0 | 20773:efbf15979538 |
|---|---|
| 1960 user=user, | 1960 user=user, |
| 1961 date=date, | 1961 date=date, |
| 1962 extra=extra) | 1962 extra=extra) |
| 1963 if editmsg: | 1963 if editmsg: |
| 1964 new._text = commitforceeditor(repo, new, []) | 1964 new._text = commitforceeditor(repo, new, []) |
| 1965 repo.savecommitmessage(new.description()) | |
| 1965 | 1966 |
| 1966 newdesc = changelog.stripdesc(new.description()) | 1967 newdesc = changelog.stripdesc(new.description()) |
| 1967 if ((not node) | 1968 if ((not node) |
| 1968 and newdesc == old.description() | 1969 and newdesc == old.description() |
| 1969 and user == old.user() | 1970 and user == old.user() |