subrepos: prompt on conflicts on update with dirty subrepos Consider a repository with a single subrepository. The changesets in the main repository reference the subrepository changesets like this: m0 -> s0 m1 -> s1 m2 -> s2 Starting from a state (m1, s0), doing 'hg update m2' in the main repository will yield a conflict: the subrepo is at revision s0 but the target revision says it should be at revision s2. Before this change, Mercurial would do (m1, s0) -> (m2, s2) and thus ignore the conflict between the working copy and the target revision. With this change, the user is prompted to resolve the conflict by choosing which revision he wants. This is consistent with 'hg merge', which also prompts the user when it detects conflicts in the merged .hgsubstate files. The prompt looks like this: $ hg update tip subrepository sources for my-subrepo differ use (l)ocal source (fc627a69481f) or (r)emote source (12a213df6fa9)?

     1

Mercurial

     2

=========

     3

     4

Mercurial is a fast, easy to use, distributed revision control tool

     5

for software developers.

     6

     7

Basic install:

     8

     9

 $ make            # see install targets

    10

 $ make install    # do a system-wide install

    11

 $ hg debuginstall # sanity-check setup

    12

 $ hg              # see help

    13

    14

See http://mercurial.selenic.com/ for detailed installation

    15

instructions, platform-specific notes, and Mercurial user information.