equal
deleted
inserted
replaced
707 raise util.Abort(_('branch name not in UTF-8!')) |
707 raise util.Abort(_('branch name not in UTF-8!')) |
708 else: |
708 else: |
709 branchname = "" |
709 branchname = "" |
710 |
710 |
711 if use_dirstate: |
711 if use_dirstate: |
712 oldname = c1[5].get("branch") or "default" # stored in UTF-8 |
712 oldname = c1[5].get("branch") # stored in UTF-8 |
713 if not commit and not remove and not force and p2 == nullid and \ |
713 if not commit and not remove and not force and p2 == nullid and \ |
714 branchname == oldname: |
714 branchname == oldname: |
715 self.ui.status(_("nothing changed\n")) |
715 self.ui.status(_("nothing changed\n")) |
716 return None |
716 return None |
717 |
717 |