Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

commit: show both parents when merging

Changeset 321cb6dd8eda…

Parent 61344861c07a…

by Steve Borho

Changes to one file · Browse files at 321cb6dd8eda Showing diff from parent 61344861c07a Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
78
79
80
81
82
83
84
85
 
 
 
 
 
86
87
88
 
78
79
80
 
 
 
 
 
81
82
83
84
85
86
87
88
@@ -78,11 +78,11 @@
    usercombo.setEditable(True)   form.addRow(_('Changeset:'), QLabel(_('Working Copy'))) - ctx = repo['.'] - desc = format_desc(ctx.description(), 80) - fmt = "<span style='font-family:Courier'>%s(%s)</span> %s" - ptext = fmt % (ctx.rev(), short_hex(ctx.node()), desc) - form.addRow(_('Parent:'), QLabel(ptext)) + for ctx in repo.parents(): + desc = format_desc(ctx.description(), 80) + fmt = "<span style='font-family:Courier'>%s(%s)</span> %s" + ptext = fmt % (ctx.rev(), short_hex(ctx.node()), desc) + form.addRow(_('Parent:'), QLabel(ptext))   form.addRow(_('User:'), usercombo)   frame = QFrame()   frame.setLayout(form)