equal
deleted
inserted
replaced
178 if collapsef: |
178 if collapsef: |
179 branches = set() |
179 branches = set() |
180 for rev in state: |
180 for rev in state: |
181 branches.add(repo[rev].branch()) |
181 branches.add(repo[rev].branch()) |
182 if len(branches) > 1: |
182 if len(branches) > 1: |
183 raise util.Abort(_('cannot collapse multiple named ' |
183 raise util.Abort(_('cannot collapse multiple named ' |
184 'branches')) |
184 'branches')) |
185 |
185 |
186 |
186 |
187 # Rebase |
187 # Rebase |
188 if not targetancestors: |
188 if not targetancestors: |