Skip to content

GitLab

  • Menu
Projects Groups Snippets
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • heptapod heptapod
  • Project information
    • Project information
    • Activity
    • Labels
    • Planning hierarchy
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 157
    • Issues 157
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 1
    • Merge requests 1
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • heptapod
  • heptapodheptapod
  • Issues
  • #211

Closed
Open
Created Mar 06, 2020 by Pierre Augier@paugier

Wrong (?) "remote: rejecting multiple heads on branch"

I can't push changesets on a repository with error log:

pushing to ssh://hg@foss.heptapod.net/fluiddyn/fluidsim
searching for changes
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: rejecting multiple heads on branch "default:fix_issue_42"
remote: (2 heads: 8babca7c67e3 68fc149d5f39)
abort: push failed on remote

However, this topic has only one head not obsolated. But I used the evolve extension (with hg prune; hg evolve; hg rebase).

The output of hg log -G --hidden -r "not topic(coarse_to_mpi)":

o  changeset:   1342:68fc149d5f39
|  topic:       fix_issue_42
|  user:        Jason Reneuve <jason.reneuve@univ-grenoble-alpes.fr>
|  date:        Fri Mar 06 15:52:38 2020 +0100
|  summary:     get str_width from files
|
o  changeset:   1341:ee6256e0383b
|  topic:       fix_issue_42
|  parent:      1334:468985ee0c33
|  user:        Jason Reneuve <jason.reneuve@univ-grenoble-alpes.fr>
|  date:        Tue Mar 03 15:00:58 2020 +0100
|  summary:     dynamic fstring width for filename
|
| x  changeset:   1340:860fa9b757bd
| |  topic:       fix_issue_42
| |  user:        Jason Reneuve <jason.reneuve@univ-grenoble-alpes.fr>
| |  date:        Fri Mar 06 15:52:38 2020 +0100
| |  obsolete:    rebased using rebase as 1342:68fc149d5f39
| |  summary:     get str_width from files
| |
| x  changeset:   1339:8de2a1f7d487
| |  topic:       fix_issue_42
| |  parent:      1324:b061f07817df
| |  user:        Jason Reneuve <jason.reneuve@univ-grenoble-alpes.fr>
| |  date:        Tue Mar 03 15:00:58 2020 +0100
| |  obsolete:    rebased using rebase as 1341:ee6256e0383b
| |  summary:     dynamic fstring width for filename
| |
| | x  changeset:   1338:c6a9df6c84e8
| | |  topic:       fix_issue_42
| | |  user:        Jason Reneuve <jason.reneuve@univ-grenoble-alpes.fr>
| | |  date:        Fri Mar 06 15:52:38 2020 +0100
| | |  obsolete:    rebased using evolve as 1340:860fa9b757bd
| | |  summary:     get str_width from files
| | |
| | x  changeset:   1337:97bab3538476
| | |  topic:       fix_issue_42
| | |  parent:      1328:8babca7c67e3
| | |  user:        Jason Reneuve <jason.reneuve@univ-grenoble-alpes.fr>
| | |  date:        Tue Mar 03 15:00:58 2020 +0100
| | |  obsolete:    rewritten using evolve as 1339:8de2a1f7d487
| | |  summary:     dynamic fstring width for filename
| | |
| | | x  changeset:   1335:5ab722920bff
| | | |  topic:       fix_issue_42
| | | |  parent:      1332:c9bce921fba4
| | | |  user:        Jason Reneuve <jason.reneuve@univ-grenoble-alpes.fr>
| | | |  date:        Fri Mar 06 15:52:38 2020 +0100
| | | |  obsolete:    rewritten as 1338:c6a9df6c84e8
| | | |  summary:     get str_width from files
| | | |
@ | | |  changeset:   1334:468985ee0c33
| | | |  parent:      1327:9550b103ac2d
| | | |  user:        paugier <pierre.augier@univ-grenoble-alpes.fr>
| | | |  date:        Fri Mar 06 10:50:29 2020 +0100
| | | |  summary:     Remove wrong parameter params.NO_SHEAR_MODES in ns2d.strat (fix #39)
| | | |
| | | x  changeset:   1332:c9bce921fba4
| | |/   topic:       fix_issue_42
| | |    parent:      1328:8babca7c67e3
| | |    user:        Jason Reneuve <jason.reneuve@univ-grenoble-alpes.fr>
| | |    date:        Tue Mar 03 15:00:58 2020 +0100
| | |    obsolete:    amended as 1337:97bab3538476
| | |    summary:     dynamic fstring width for filename
| | |
| | x  changeset:   1328:8babca7c67e3
| |/   topic:       fix_issue_42
| |    parent:      1324:b061f07817df
| |    user:        Jason Reneuve <jason.reneuve@univ-grenoble-alpes.fr>
| |    date:        Tue Mar 03 11:01:15 2020 +0100
| |    obsolete:    pruned using prune
| |    summary:     longer fstring float width (fix #42)
| |
o |  changeset:   1327:9550b103ac2d
|/   parent:      1324:b061f07817df
|    user:        Jason Reneuve <jason.reneuve@univ-grenoble-alpes.fr>
|    date:        Tue Mar 03 12:07:30 2020 +0100
|    summary:     modif_resol HAS_TO_SAVE=True
|
o  changeset:   1324:b061f07817df
|  user:        paugier <pierre.augier@univ-grenoble-alpes.fr>
|  date:        Tue Feb 25 14:39:07 2020 +0100
|  summary:     ik012rank_from_kadim and reverse

Isn't it a bug? What can I do in such cases?

Edited Mar 06, 2020 by Pierre Augier
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking