mercurial/commands.py
changeset 17425 e95ec38f86b0
parent 17424 e7cfe3587ea4
child 17537 31f32a96e1e3
equal deleted inserted replaced
17424:e7cfe3587ea4 17425:e95ec38f86b0
  1350         # In the following, it is assumed that there already exists some
  1350         # In the following, it is assumed that there already exists some
  1351         # initial branch heads of the current branch, otherwise nothing is
  1351         # initial branch heads of the current branch, otherwise nothing is
  1352         # printed anyway.
  1352         # printed anyway.
  1353         #
  1353         #
  1354         # Par Msg Comment
  1354         # Par Msg Comment
  1355         # NN   y  additional topo root
  1355         # N N  y  additional topo root
  1356         #
  1356         #
  1357         # BN   y  additional branch root
  1357         # B N  y  additional branch root
  1358         # CN   y  additional topo head
  1358         # C N  y  additional topo head
  1359         # HN   n  usual case
  1359         # H N  n  usual case
  1360         #
  1360         #
  1361         # BB   y  weird additional branch root
  1361         # B B  y  weird additional branch root
  1362         # CB   y  branch merge
  1362         # C B  y  branch merge
  1363         # HB   n  merge with named branch
  1363         # H B  n  merge with named branch
  1364         #
  1364         #
  1365         # CC   y  additional head from merge
  1365         # C C  y  additional head from merge
  1366         # CH   n  merge with a head
  1366         # C H  n  merge with a head
  1367         #
  1367         #
  1368         # HH   n  head merge: head count decreases
  1368         # H H  n  head merge: head count decreases
  1369 
  1369 
  1370     if not opts.get('close_branch'):
  1370     if not opts.get('close_branch'):
  1371         for r in parents:
  1371         for r in parents:
  1372             if r.closesbranch() and r.branch() == branch:
  1372             if r.closesbranch() and r.branch() == branch:
  1373                 ui.status(_('reopening closed branch head %d\n') % r)
  1373                 ui.status(_('reopening closed branch head %d\n') % r)