How to tell Mercurial to automatically accept "their" version during a merge conflict of any files in a particular directory? -

-

first off, prefer not check in generated files @ manager insists. so, given constraints create mercurial "merge-patterns" take "their files" in directories named "generated" in working repo. have read hgrc documentation , related post , here think should like:

[merge-patterns] generated/** = internal:other #keep files

and placed in root .hg/hgrc file. when run hg update merge conflicts get:

> hg update couldn't find merge tool internal:other #keep files specified generated/** merging generated/file.sv

so modified "merge-patterns" this:

[merge-patterns] **/generated/** = internal:other #keep files

and here get:

> hg update merging generated/file.sv

so, no longer "couldn't find merge tool internal:other" warning still trying merge generated files.

any ideas on how work?

additional notes:

  1. we using mercurial version 1.7.5 having problems newer versions , subrepos.
  2. i working subrepos here structure of main repo looks like:

enter image description here

i believe problem comment! mercurial searching tool named

internal:other #keep files

and that's unlikely exist :-) try moving comment line above:

[merge-patterns] # keep files generated/** = internal:other

i haven't tested out, believe still need first pattern used — warning went away second try because pattern no longer matched inside subrepo. when start merge top-level, subrepos merged if hg merge executed inside subrepo.


Comments

Post a Comment

Popular posts from this blog

jasper reports - Fixed header in Excel using JasperReports -

-
how can create excel report fixed header using japserreports? mean need header fixed when scroll excel file. this possible adding couple properties in jrxml file each report. take @ advanced excel features freeze panes. if wanted freeze after first column header (down left side basically) this: <statictext> <reportelement style="sans_bold" mode="opaque" x="0" y="60" width="104" height="20" forecolor="#ffffff" backcolor="#666666"> <property name="net.sf.jasperreports.export.xls.auto.filter" value="start"/> <property name="net.sf.jasperreports.export.xls.column.width" value="110"/> <property name="net.sf.jasperreports.export.xls.freeze.column.edge" value="left"/> </reportelement> &
Read more

media player - Android: mediaplayer went away with unhandled events -

-
i need duration of audio file series of voice announcements need play app. have added audio files resources , play fine. sample code below works perfect intended purpose: return duration of audio files. here code: float getdurationofaudioresource(locationenum loc, context context){ float duration = 0; try { mediaplayer mp; mp = mediaplayer.create(context, getaudioresource(loc)); duration = mp.getduration(); mp.release(); mp = null; } catch (illegalstateexception e) {e.printstacktrace(); logerror(25, "testdescitem:fault::could not open mediaplayer object audio resource.");} return duration; } here's weird thing. code called in main activity prepares set of audio instructions given test. there no errors within activity. second activity called, long string of errors on logcat. 03-07 13:23:43.820: i/actionlogger(21435): gentest_info_test #0 created. 03-07 13:23:43.830: i/actionlogger(21435): gente
Read more

python - ('The SQL contains 0 parameter markers, but 50 parameters were supplied', 'HY000') or TypeError: 'tuple' object is not callable -

-
import pyodbc,nltk,array cnxn = pyodbc.connect('driver={mysql odbc 5.1 driver};server=127.0.0.1;port=3306;database=information_schema;user=root; password=1234;option=3;') cursor = cnxn.cursor() cursor.execute("use collegedatabase ;") cursor.execute("select * sampledata ; ") cnxn.commit() s=[] j=[] x=[] words = [] w = [] sfq = [] pos=[] entry in cursor: s.append(entry.injury_type),j.append(entry.injury_desc) nltk.tokenize import punktwordtokenizer nltk.corpus import stopwords tokenizer = punktwordtokenizer() english_stops = set(stopwords.words('english')) in range(0,26): # filter stop words tokenizer.tokenize(j[i]) w.append([word word in tokenizer.tokenize(j[i]) if word not in english_stops]) in range(0 , 26):#converting tokenzied text ito string sfq.append(" ".join(w[a])) replacers import regexpreplacer replacer = regexpreplacer() in range (0,26):#pos tagging replacer.repl
Read more