Mercurial > hg
view tests/test-revlog-ancestry.py @ 14485:610873cf064a
Make pull -u behave like pull && update
Previously, pull would not update if new branch heads were received,
whereas pull && update would move to the tipmost branch head.
Also change the "crosses branches" abort in merge.update from
"crosses branches (merge branches or use --check to force update)"
to
"crosses branches (merge branches or update --check to force update)"
since it can no longer assume the user is running hg update.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Tue, 31 May 2011 11:52:22 -0700 |
parents | a1aad8333864 |
children | 91f3ac205816 |
line wrap: on
line source
import os from mercurial import hg, ui, merge u = ui.ui() repo = hg.repository(u, 'test1', create=1) os.chdir('test1') def commit(text, time): repo.commit(text=text, date="%d 0" % time) def addcommit(name, time): f = open(name, 'w') f.write('%s\n' % name) f.close() repo[None].add([name]) commit(name, time) def update(rev): merge.update(repo, rev, False, True, False) def merge_(rev): merge.update(repo, rev, True, False, False) if __name__ == '__main__': addcommit("A", 0) addcommit("B", 1) update(0) addcommit("C", 2) merge_(1) commit("D", 3) update(2) addcommit("E", 4) addcommit("F", 5) update(3) addcommit("G", 6) merge_(5) commit("H", 7) update(5) addcommit("I", 8) # Ancestors print 'Ancestors of 5' for r in repo.changelog.ancestors(5): print r, print '\nAncestors of 6 and 5' for r in repo.changelog.ancestors(6, 5): print r, print '\nAncestors of 5 and 4' for r in repo.changelog.ancestors(5, 4): print r, # Descendants print '\n\nDescendants of 5' for r in repo.changelog.descendants(5): print r, print '\nDescendants of 5 and 3' for r in repo.changelog.descendants(5, 3): print r, print '\nDescendants of 5 and 4' for r in repo.changelog.descendants(5, 4): print r,