/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Jelmer Vernooij
  • Date: 2007-10-30 22:55:35 UTC
  • mto: (0.441.2 dev) (7406.3.1 rebase)
  • mto: This revision was merged to the branch mainline in revision 7441.
  • Revision ID: jelmer@samba.org-20071030225535-vvduqzul9kssxpzb
Don't require running in the branch root.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
122
122
        if upstream_location is None:
123
123
            upstream_location = wt.branch.get_parent()
124
124
            info("Rebasing on %s" % upstream_location)
125
 
        upstream = Branch.open(upstream_location)
 
125
        upstream = Branch.open_containing(upstream_location)[0]
126
126
        upstream_repository = upstream.repository
127
127
        upstream_revision = upstream.last_revision()
128
128
        try:
295
295
            wt.unlock()
296
296
 
297
297
class cmd_replay(Command):
298
 
    """Replay a commit on top of a different branch.
 
298
    """Replay commits from another branch on top of this one.
299
299
 
300
300
    """
301
301
    
308
308
        from bzrlib import ui
309
309
        from rebase import regenerate_default_revid, replay_delta_workingtree
310
310
 
311
 
        from_branch = Branch.open(location)
 
311
        from_branch = Branch.open_containing(location)[0]
312
312
 
313
313
        if revision is not None:
314
314
            if len(revision) == 1: