How to use internal:other merge tool with mercurial largefiles extension

162 Views Asked by At

When rebasing a revision in mercurial one can choose to resolve any merge conflicts by always choosing the "other" (source) version of a file using:

hg rebase -s source_rev -d dest_rev --tool internal:other

In this case, the rebase needs no user input.

When one uses the same command on a repository which uses the largefiles extension however, conflicts are presented to the user interactively:

rebasing 105:b6be8e15656a "Example revision title"
largefile example/largefile.bin has a merge conflict
ancestor was df821d19072c6afc4dce68dadfabea9a11bd0384
keep (l)ocal 01bf634a9dbcdafd400830be8f98477b5410ab6c or
take (o)ther 9adb01d479a1edcc5c9bf6e42249ab5167cdfa1d? 

Is there any way of always answering "o"? I tried echo o | hg rebase ... but this counter-intuitively always chooses "l".

0

There are 0 best solutions below