mercurial - why is a new head created during this push? -


my production code in default branch, new features go named branches merged default when new features ok. merged development daytemp default , started work on branch separate processes. pushed had bitbucket, status shows now:

bitbucket

i realized there bug in default so, @ computer, pulled, updated default , fixed bug. commited commit a7cf17ca158e ("bug: bars displayed...") , wanted push bitbucket. tortoise hg on computer shows:

tortoise hg

can please me understand problem is? mercurial docs understand have standard situation (i have 2 heads, 1 default , 1 separate processes) not understand new 1 bitbucket warns me creating when pushing.

edit turned out that, following vince's comment, there indeed new head hidden down graph.

output hg outgoing:

changeset:   152:ce343f208e48 parent:      150:ebd10baed373 user:        wojtek date:        thu may 15 06:21:43 2014 +0200 summary:     bug: time string when no connection  changeset:   161:a7cf17ca158e tag:         tip parent:      159:dd4af8e3f7d5 user:        wojtek date:        fri may 16 19:55:54 2014 +0200 summary:     bug: bars displayed after day (not cleaned up)

than changeset 152 culprit. after merging current default push went fine.

what have when doing hg outgoing?

could have default head in current repo, not visible in scope, attempted pushed well? i'm saying 2 heads may in local repo.


-

Comments

Post a Comment

Popular posts from this blog

how to proxy from https to http with lighttpd -

i have internal site (192.168.2.1) accessible http on different server run public web-server using lighttpd. can make internal site accessible outside work follows $http["host"] == "internal.example.com" { ... proxy.server = ( "" => ( "internal" => ( "host" => "192.168.2.1", "port" => 8000 ) ) } this works, use https outside world. question is, how can proxy going https http ? i've tried this: $server["socket"] == ":443" { $http["host"] == "internal.example.com" { ... proxy.server = ( "" => ( "internal" => ( "host" => "http://192.168.2.1", "port" => 8000 ) ) } } but doesn't seem wor...
Read more

android - Automated my builds -

i have multiple app , android project want automated in build , release sequence. have ant script build , create apk of app. want have 1 script or ant file start build sequence app. maybe don't konw search, can't find easy documentation on ant. the point of use jenkins ant (or maven, i'm not sure of difference between them now) automated build sequence when people commit on project. any int appreciated maven dependencies (over ant) don't need pass around jars. recommend maven on ant day. syntax , overall process easier understand, @ end of both build tools. if able to, more recommend upgrading gradle. easy create different build types , create them ./gradlew assemble here project jake wharton can see power of gradle. there release , debug build, can make lot more if like. https://github.com/jakewharton/u2020 here android docs gradle http://tools.android.com/tech-docs/new-build-system/user-guide . if can't find looking here, check out main grad...
Read more

python - Flask migration error -

i've got application build on flask , wanted create new migration today. when run $python manage.py db upgrade i got message raise util.commanderror('only single head supported. ' alembic.util.commanderror: single head supported. script directory has multiple heads (due branching), must resolved manually editing revision files form linear sequence. run alembic branches see divergence(s). so run command $alembic branches no config file 'alembic.ini' found, or file has no '[alembic]' section any clue on about? the error messages coming alembic, use command form alembic <command> , integrating flask coming flask-migrate, need use form python manage.py db branches . to resolve multiple branches, make 1 of branches point down other branch upgrade graph straight line. see alembic's docs on branches: http://alembic.readthedocs.org/en/latest/branches.html
Read more