Mercurial > hg
comparison hgext/rebase.py @ 8266:609ce91670d0
rebase: fix bug where --keepbranches could leave wrong branch in dirstate
Report and original fix by Augie Fackler <durin42@gmail.com>
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 01 May 2009 12:26:37 +0200 |
parents | aee8455ee8ec |
children | 3477ad0b1f2c |
comparison
equal
deleted
inserted
replaced
8255:ea82a23cf887 | 8266:609ce91670d0 |
---|---|
170 newrev = repo.commit(m+a+r, | 170 newrev = repo.commit(m+a+r, |
171 text=commitmsg, | 171 text=commitmsg, |
172 user=repo[rev].user(), | 172 user=repo[rev].user(), |
173 date=repo[rev].date(), | 173 date=repo[rev].date(), |
174 extra=extra) | 174 extra=extra) |
175 repo.dirstate.setbranch(repo[newrev].branch()) | |
175 return newrev | 176 return newrev |
176 except util.Abort: | 177 except util.Abort: |
177 # Invalidate the previous setparents | 178 # Invalidate the previous setparents |
178 repo.dirstate.invalidate() | 179 repo.dirstate.invalidate() |
179 raise | 180 raise |