Commits

Anonymous committed 0244f95

fixed crash when commiting after merging a task
fixes #14

  • Participants
  • Parent commits 681ae00

Comments (0)

Files changed (1)

File hgext/tasks.py

                     if len(parents) > 1:
                         if tinfo['state'] == 1:
                             ui.write('completing task %s\n' % tname)
-                            if hasstash(self, task):
+                            if hasstash(self, tname):
                                 ui.write('warning: task stash still present\n'
                                     ' update to task to retrieve stash')
                             tinfo['state'] = 2
         def push(self, remote, force=False, revs=None, completed_tasks=False,
                 all_tasks=False):
             if all_tasks:
+                print "whut!"
                 return super(task_repo, self).push(remote, force, revs)
 
             if completed_tasks and all_tasks: