Mercurial > hg
comparison hgext/rebase.py @ 8270:3477ad0b1f2c
Merge with crew-stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Fri, 01 May 2009 12:35:13 +0200 |
| parents | cb08c3765a02 609ce91670d0 |
| children | 6d4bf1c1a003 |
comparison
equal
deleted
inserted
replaced
| 8269:bb9f13974d8e | 8270:3477ad0b1f2c |
|---|---|
| 174 newrev = repo.commit(m+a+r, | 174 newrev = repo.commit(m+a+r, |
| 175 text=commitmsg, | 175 text=commitmsg, |
| 176 user=repo[rev].user(), | 176 user=repo[rev].user(), |
| 177 date=repo[rev].date(), | 177 date=repo[rev].date(), |
| 178 extra=extra) | 178 extra=extra) |
| 179 repo.dirstate.setbranch(repo[newrev].branch()) | |
| 179 return newrev | 180 return newrev |
| 180 except util.Abort: | 181 except util.Abort: |
| 181 # Invalidate the previous setparents | 182 # Invalidate the previous setparents |
| 182 repo.dirstate.invalidate() | 183 repo.dirstate.invalidate() |
| 183 raise | 184 raise |