merge - TortoiseHG Workbench's Tool Resolve adding diff text to file -


i have strange issue can't seem pin down. whenever use tool resolve, first time click 'tool resolve', diffs added file. here's ended being in file after merge conflict fix:

tool resolve:

function datavalid(data) {   return "requests" in data && "suggestion" in data; <<<<<<< dest } ======= }>>>>>>> source

original:

function datavalid(data) {   return "requests" in data && "suggestion" in data; }  function shifttypetotitle(shifttype) {   // removed logic }

my commit remove shifttypetotitle.

if tool resolve not able automatically resolve conflict, 3-way diff window opens. can see diff text in there. if close out of window without saving , click "tool resolve" again, diff text gone time!

if tool resolve able automatically resolve conflict, have no opportunity cancel without saving , retry can above, in case, diff text committed file.

this driving me absolutely insane; have suggestions of have can go finding out why happens , how fix it?


-

Comments

Post a Comment

Popular posts from this blog

c++ - CPP, 'X' button listener -

i'm writing cpp program, , want execute function when 'x'(shut down) button pressed. for example, have infinite loop prints same thing everytime iterates, until 'x' button pressed, , want execute function before process ends. is there kind of listener matter? or other solution maybe (like delaying process shut down few seconds or something)? thanks! if want execute before process ends, can register std::atexit handler. function called before process exits.
Read more

shared memory - gstreamer shmsrc and shmsink with h264 data -

i trying share h264 encoded data gstreamer 2 processes(both based on gstreamer).after research way found use shm plugin. trying do gstreamer--->h264 encoder--->shmsink shmrc--->process1 shmrc--->process2 i able raw data videotestsrc , webcam working. h264 encoded data doesn't. test pipeline gst-launch-1.0 videotestsrc ! video/x-raw,width=640,height=480,format=yuy2 ! x264enc ! shmsink socket-path=/tmp/foo sync=true wait-for- connection=false shm-size=10000000 gst-launch-1.0 shmsrc socket-path=/tmp/foo ! avdec_h264 ! video/x- raw,width=640,height=480,framerate=25/1,format=yuy2 ! autovideosink have tried shm plugins h264 encoded data, please help iam not aware of capabilities of sink used in "autovideosink", per knowledge either need use videoconvert if format supported sink (like kmssink or ximagesink) different provided source (in case yuy2) or use videoparse if camera format supported sink. may check using gst-inspect-1...
Read more

.net - Bulk insert via Dapper is slower than inserting rows one-by-one -

i'm using dapper insert data realtime feed sql server, care performance. recently, noticed strange. out of box, if give dapper collection , insert query, fires insert statements each element. tests show can insert 1800 objects 12 fields in 1 second way (counting connection.execute(...) running time. now, didn't find batch insert functionality in dapper , implemented own (constructing parameter list , sql query). after that, found out can insert 1 batch in 3 seconds (which limited 1000 rows) (again, counting connection.execute(...) calls. so, makes batching 6 times slower sending each row in separate query. can explain me? thought people use batch operations speed process. insert time 1 second @ most. use sql server 2012 standard on local network. table i'm inserting has clustered index on primary key (which bigint field), no non-clustered indexes , triggers. can post code, there's nothing special i'm not sure why using dapper execute extension ...
Read more