hgext/evolution.py
changeset 131 3124889cad55
parent 130 b70fadbccc2a
equal deleted inserted replaced
130:b70fadbccc2a 131:3124889cad55
   305         change = 'p1(p1())'
   305         change = 'p1(p1())'
   306     old = scmutil.revsingle(repo, change)
   306     old = scmutil.revsingle(repo, change)
   307     branch = opts.get('branch')
   307     branch = opts.get('branch')
   308     if branch:
   308     if branch:
   309         opts.setdefault('extra', {})['branch'] = branch
   309         opts.setdefault('extra', {})['branch'] = branch
       
   310     else:
       
   311         if old.branch() != 'default':
       
   312             opts.setdefault('extra', {})['branch'] = old.branch()
   310 
   313 
   311     lock = repo.lock()
   314     lock = repo.lock()
   312     try:
   315     try:
   313         wlock = repo.wlock()
   316         wlock = repo.wlock()
   314         try:
   317         try: