upstream/mercurial-mirror Files · mercurial/templates/raw

rebase: fix working copy location after a --collapse (issue4080)...

rebase: fix working copy location after a --collapse (issue4080) Rebasing with --collapse would leave the working copy on the parent of the collapsed commit, instead of on the collapsed commit. This fixes that. Also fixes a few tests that already covered this area but had bad data. This also fixes issue3716 where bookmarks are not kept across rebases with --collapse. I updated the test to cover that case as well.

Durham Goode -


            r19986:ea81f8b2

stable

Name	Size	Modified	Last Commit	Author
/ mercurial / templates / raw
changelog.tmpl	Loading ...
changeset.tmpl	Loading ...
error.tmpl	Loading ...
fileannotate.tmpl	Loading ...
filediff.tmpl	Loading ...
graph.tmpl	Loading ...
graphedge.tmpl	Loading ...
graphnode.tmpl	Loading ...
index.tmpl	Loading ...
logentry.tmpl	Loading ...
manifest.tmpl	Loading ...
map	Loading ...
notfound.tmpl	Loading ...
search.tmpl	Loading ...

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages