Mercurial Mercurial > mercurial / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/rebase.py
changeset 26748 5ba0a99ff27f
parent 26745 8af610bce239
child 26781 1aee2ab0f902
equal deleted inserted replaced
26747:beff0b2481b3 26748:5ba0a99ff27f 
   626     if repo['.'].rev() != p1:
 
   626     if repo['.'].rev() != p1:
 
   627         repo.ui.debug(" update to %d:%s\n" % (p1, repo[p1]))
 
   627         repo.ui.debug(" update to %d:%s\n" % (p1, repo[p1]))
 
   628         merge.update(repo, p1, False, True, False)
 
   628         merge.update(repo, p1, False, True, False)
 
   629     else:
 
   629     else:
 
   630         repo.ui.debug(" already in target\n")
 
   630         repo.ui.debug(" already in target\n")
 
   631     repo.dirstate.write()
 
   631     repo.dirstate.write(repo.currenttransaction())
 
   632     repo.ui.debug(" merge against %d:%s\n" % (rev, repo[rev]))
 
   632     repo.ui.debug(" merge against %d:%s\n" % (rev, repo[rev]))
 
   633     if base is not None:
 
   633     if base is not None:
 
   634         repo.ui.debug("   detach base %d:%s\n" % (base, repo[base]))
 
   634         repo.ui.debug("   detach base %d:%s\n" % (base, repo[base]))
 
   635     # When collapsing in-place, the parent is the common ancestor, we
 
   635     # When collapsing in-place, the parent is the common ancestor, we
 
   636     # have to allow merging with it.
 
   636     # have to allow merging with it.
mercurial