search

dotmesh-io / dotmesh

dotmesh (dm) is like git for your data volumes (databases, files etc) in Docker and Kubernetes
https://dotmesh.com
Apache License 2.0
539 stars 29 forks source link

--stash-on-divergence doesn't handle "no common snapshots" case #600

Open alaric-dotmesh opened 5 years ago

alaric-dotmesh commented 5 years ago

I'm getting this error:

Error: Command failed: DEBUG_MODE=1 dm push --stash-on-divergence dotscience-hub
Response event != finished-{push,pull} or peer-up-to-date: <Event error-in-canapply-when-pushing: err: "no common snapshots from [0xc4226074e0 0xc422607520 0xc422607560 0xc4226075e0 0xc422607620 0xc422607660 0xc4226076c0 0xc422607700 0xc422607780 0xc4226077c0 0xc422607800 0xc422607840 0xc422607880 0xc4226078c0 0xc422607900 0xc422607940 0xc422607980 0xc4226079c0 0xc422607a00 0xc422607a40 0xc422607aa0 0xc422607ae0 0xc422607b40 0xc422607ba0 0xc422607be0 0xc422607c20 0xc422607c60 0xc422607ca0 0xc422607ce0 0xc422607d20 0xc422607d60 0xc422607da0 0xc422607de0 0xc422607e20 0xc422607e80 0xc422607ec0 0xc422607f00 0xc422607f60 0xc422607fa0 0xc422607fe0 0xc422584060 0xc4225840e0 0xc422584160 0xc4225841a0 0xc4225841e0 0xc422584220 0xc422584260 0xc4225842a0 0xc4225842e0 0xc422584320 0xc422584360 0xc4225843a0 0xc4225843e0 0xc422584440 0xc422584480 0xc4225844c0 0xc422584500 0xc422584540 0xc422584580 0xc4225845c0 0xc422584620 0xc422584660 0xc4225846c0 0xc422584700 0xc422584740 0xc422584780 0xc4225847c0 0xc422584820 0xc422584860 0xc4225848a0 0xc4225848e0 0xc422584920 0xc422584960 0xc4225849a0 0xc4224f90c0] to [0xc422505240]">

This arose because a previous error (which I didn't get to see, but a second-hand account of it is in #601) caused the workspace dot on the hub to lose all its commits and have all its state as dirty data:

  luke/project-ff7f1818-default-workspace        master  798c10cbf47e6a6a              -           0        9.91 MiB

So I committed it and tried to start Jupyter, and --stash-on-divergence couldn't stash that divergence :-(