mercurial - tortoisemerge with Hg reports all lines as changed -

-

i'd use tortoisemerge mercurial resolve conflicts, reporting every line in theirs , mine added though not comparing properly

here mercurial.ini:

[ui] merge = tortoisemerge  [merge-tools] tortoisemerge.executable=c:\program files\tortoisesvn\bin\tortoisemerge.exe tortoisemerge.args=/mine:$local /theirs:$other /base:$base -o /merged:$output

i'm using hg 1.7.5

what's going on?

update: when using kdiff or beyondcompare, base empty.

thanks

your setup appears correct.

this symptomatic of having no copy of file in base revision, in case mercurial acts if file present empty.

there couple ways of figuring out what's going on here. if there no copies or renames involved, should able do:

$ hg log -r "ancestor(p1(), p2())"

..to determine ancestor of merge, then:

$ hg manifest -r <rev> | grep <your file>

..to determine if file in fact present.

alternately, can run 'hg merge --debug' or 'hg update --debug' see changeset , file it's choosing merge (including rename/copy details).

if find file is present in common ancestor mercurial chooses, should report bug (including debug output) at:

https://www.mercurial-scm.org/wiki/bugtracker


Comments

Post a Comment

Popular posts from this blog

Javascript line number mapping -

-
magically formatted comments change reported line number of javascript errors in browsers; this: //@line n "f" n line number , f file name. unfortunately, //@line appears ungoogleable. know there documentation on feature, , browsers support it? (i found references here , here .) from can find available in mozilla based browsers. it using js_setoptions command can turn these options on or off depending on values passed. https://developer.mozilla.org/en/js_setoptions
Read more

c# - Is it possible to remove an existing registration from Autofac container builder? -

-
something along lines: builder.registertype<mytype>().as<itype>(); builder.registertype<mytype2>().as<itype>(); builder.deregistertype<mytype>().as<itype>() var container = builder.build(); var types = container.resolve<ienumerable<itype>>(); assert.istrue(types.count == 1); assert.istrue(types[0].gettype == typeof(mytype2)); scenario: go through bunch of assemblies , go register types want make sure have 1 implementation of given type. need before create container. track on own nice if autofac me bit. this cannot done directly using containerbuilder , unless start on new one. mind you, having first built container should able construct new container filtering away unwanted types , reusing registrations first container. this: ... var container = builder.build(); builder = new containerbuilder(); var components = container.componentregistry.registrations .where(cr => cr.activator.limittype != typ...
Read more

php - Mysql PK and FK char(36) vs int(10) -

-
i have read mysql can handle indexes , searches better if tables keys integers rather char(36) uuid's. is worth converting int(10)? note: use 1 server , have have plans use multiple databases concurrently therefore removing 1 of big reasons using uuid. our tables innodb if makes difference. thanks in advance. usually rdbms can handle integer keys pk more efficient, other datatypes. reason how build index column, yes: long dont require string (or other typed) keys, should use integers. however: char(36) , int(10) far away being equal, because int(10) much smaller, char(36). dont know, if require many different keys, should keep in mind. update, complete last paragraph: int(10) 32-bit, char(36) 36 - ^byte^ (= 288-bit). not mean, int consumes less space, means, char(36) has 4 times more different keys.
Read more