I need help. FAQ.html has "instructions" to fix this but the instructions are not complete enough: they say
"Fixing this is complicated. Basically, you clone the repo before you made head #2, then create the diff for the bad changeset that made head #2. Apply it to the clone and checkin, then pull the master. Now 1) how do I clone the repo before you made head #2? 2) how do you create the diff for the bad changeset that made head # 2 3) how do you apply it to the clone 4) how do you checkin? Never heard of checkin in mecurial Please let me know this and I will also update the FAQ. [barry-smiths-macbook-pro:src/sys/totalview] barrysmith% hg merge abort: outstanding uncommitted changes (use 'hg status' to list changes) [barry-smiths-macbook-pro:src/sys/totalview] barrysmith% hg commit nothing changed [barry-smiths-macbook-pro:src/sys/totalview] barrysmith% hg status | head -5 ! src/ksp/ksp/examples/tutorials/ex1.c ? ! ? #configure.log# ? arch-g++.py ? bin/#petscrun# [ [barry-smiths-macbook-pro:src/sys/totalview] barrysmith% hg heads changeset: 16298:503f0f312436 tag: tip parent: 16297:53f17d50e2f2 parent: 16296:90b6abac8d23 user: Victor Minden victorminden at gmail.com date: Fri Jun 25 15:25:05 2010 -0500 description: commit after merge changeset: 16291:47055b889013 user: Barry Smith bsmith at mcs.anl.gov date: Sat Jun 26 09:54:02 2010 -0500 files: src/docs/website/documentation/codemanagement.html src/docs/website/documentation/linearsolvertable.html src/docs/website/features/index.html src/docs/website/miscellaneous/acknwldg.html src/docs/website/miscellaneous/funding.html src/sys/makefile src/sys/totalview/makefile src/sys/totalview/tv_data_display.c src/sys/totalview/tv_data_display.h description: minor cleanup of docs added totalview include and source for debugger
