On Sat, Jan 9, 2010 at 12:46 AM, jose miguel hernandez <jmiguel.h...@gmail.com> wrote: > Hello folks > > The use case is the following > The repository has binary files and text files, on a merge the tool > could solve or launch a visual merge tool for the text files but it > will fail for binary files conflicts.
Mercurial will not launch a merge tool if it detects a binary file, unless you register a merge tool for it's specific file extension/pattern. The default behavior is to ask you which version to keep: (l)ocal or (o)ther. > Lets assume you use internal:dump and manually create a version of the > binary with the correct changes. Ok. > How do you mark it as solved and restart the merge without opening the > command line? (using tortoisehg interfaces) > > I think i have read somewhere the commit tool support it, but does > mercurial merge everything it can or it stops at the first unsolved > conflict? It might not be possible to restart the merge from the > commit dialog. In the commit dialog, the binary file which had a merge conflict will have a 'U' in the merge state column, indicating 'unresolved'. You right click on the file and select 'mark as resolved', this changes the file merge state to 'R', meaning resolved. You can also restart individual file merges from the same menu. http://tortoisehg.bitbucket.org/manual/0.9/commit.html#merging -- Steve Borho ------------------------------------------------------------------------------ This SF.Net email is sponsored by the Verizon Developer Community Take advantage of Verizon's best-in-class app development support A streamlined, 14 day to market process makes app distribution fast and easy Join now and get one step closer to millions of Verizon customers http://p.sf.net/sfu/verizon-dev2dev _______________________________________________ Tortoisehg-discuss mailing list Tortoisehg-discuss@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
