Bug #2417
Latest version can not be "git pulled" - error: Your local changes to the following files would be overwritten by merge
0%
Description
Updating 9c6b8c2..38f73e1
error: Your local changes to the following files would be overwritten by merge:
docs/docresources/epg.png
docs/html/dvr_autorec.html
docs/html/dvr_timerec.html
src/epggrab/module/eit.c
src/input/mpegts/linuxdvb/linuxdvb_frontend.c
src/input/mpegts/mpegts_input.c
src/input/mpegts/satip/satip_frontend.c
src/input/mpegts/tsdemux.c
src/parsers/parser_teletext.c
src/parsers/parsers.c
src/plumbing/tsfix.c
src/service.c
src/streaming.c
src/streaming.h
src/subscriptions.c
src/timeshift.c
Please, commit your changes or stash them before you can merge.
error: The following untracked working tree files would be overwritten by merge:
docs/docresources/dvrautorecentries.png
docs/docresources/timeschedules.png
Please move or remove them before you can merge.
Aborting
History
Updated by Mark Clarkstone about 10 years ago
Updated by - Status changed from New to Invalid
This isn't a Tvheadend bug, either you (or something else) has modified those files.
<git stash> would resolve it.
Updated by Crazy Fin about 10 years ago
Updated by We´ll am not aware of any changes that I have done.
I have never seen this problem before and I have always just done:
git pull
./configure
sudo make -j5
and then started TVH with the normal command ./build.linux/tvheadend (and with necessary switches for debugging purposes).
This problem came now when I was trying to pull the latest revisions 3.9.1949 and 3.9.1950
I tested with "git stash" but it only reports back "No local changes to save".
I then tried with "git reset --hard master" and it reports back
"HEAD is now at 9c6b8c2 tsfix: apply local reference for teletext if the MPEG-TS encoder is crazy"
9c6b8c2 is version 3.9.1942 so resetting to master should bring me back to 3.9.1950 (revision 596b4e0) I guess?
If I now do "git pull" again I get
error: The following untracked working tree files would be overwritten by merge:
"docs/docresources/dvrautorecentries.png
docs/docresources/timeschedules.png
Please move or remove them before you can merge."
Sooo strange for me, I am not doing any changes of the source code at all...
Updated by Crazy Fin about 10 years ago
Ok I did a
"git checkout 596b4e0b"
and then
"git pull" and after that I was able to run configure and then compile.
However, this means now that I am not in "HEAD"-state I guess.
Updated by Mark Clarkstone about 10 years ago
Crazy Fin wrote:
Ok I did a
"git checkout 596b4e0b"
and then
"git pull" and after that I was able to run configure and then compile.
However, this means now that I am not in "HEAD"-state I guess.
Odd, have you tried starting from scratch (deleting the source dir and cloning again?)
Updated by Crazy Fin about 10 years ago
I deleted the ./tvheadend directory completely and then cloned it again.
Now "git pull" seems to work properly again.
Please close this ticket.
Updated by Mark Clarkstone about 10 years ago
Crazy Fin wrote:
I deleted the ./tvheadend directory completely and then cloned it again.
Now "git pull" seems to work properly again.Please close this ticket.
I'd already set it to "invalid" a while ago seeing as it wasn't anything to do with Tvheadend but something else, might be a bug with git? Who knows? /me shrugs.
At least you've "fixed" it, that's the main thing 