Mercurial > hg
comparison hgext/rebase.py @ 9196:07d127e771a1
merge with crew-stable
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Wed, 22 Jul 2009 22:56:45 +0200 |
parents | ec1cd3176625 d0225fa2f6c4 |
children | 4ea022359c43 |
comparison
equal
deleted
inserted
replaced
9195:8c719222ddd7 | 9196:07d127e771a1 |
---|---|
160 | 160 |
161 # Commit, record the old nodeid | 161 # Commit, record the old nodeid |
162 newrev = nullrev | 162 newrev = nullrev |
163 try: | 163 try: |
164 if last: | 164 if last: |
165 # we don't translate commit messages | |
165 commitmsg = 'Collapsed revision' | 166 commitmsg = 'Collapsed revision' |
166 for rebased in state: | 167 for rebased in state: |
167 if rebased not in skipped: | 168 if rebased not in skipped: |
168 commitmsg += '\n* %s' % repo[rebased].description() | 169 commitmsg += '\n* %s' % repo[rebased].description() |
169 commitmsg = repo.ui.edit(commitmsg, repo.ui.username()) | 170 commitmsg = repo.ui.edit(commitmsg, repo.ui.username()) |