Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-install.t
author Erik Zielke <ez@aragost.com>
Wed, 09 Feb 2011 10:53:09 +0100
changeset 13417 0748e18be470
parent 12376 97ffc68f71d3
child 13751 85d74f6babf6
permissions -rw-r--r--
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)?
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4365
46280c004f22 change tests to use simplemerge by default
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3846
diff changeset 
     1
 
hg debuginstall
11917
b03cf2349a80 tests: unify test-install
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 9734
diff changeset 
     2
 
  $ hg debuginstall
b03cf2349a80 tests: unify test-install
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 9734
diff changeset 
     3
 
  Checking encoding (ascii)...
12376
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset 
     4
 
  Checking installed modules (*/mercurial)... (glob)
11917
b03cf2349a80 tests: unify test-install
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 9734
diff changeset 
     5
 
  Checking templates...
b03cf2349a80 tests: unify test-install
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 9734
diff changeset 
     6
 
  Checking patch...
b03cf2349a80 tests: unify test-install
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 9734
diff changeset 
     7
 
  Checking commit editor...
b03cf2349a80 tests: unify test-install
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 9734
diff changeset 
     8
 
  Checking username...
b03cf2349a80 tests: unify test-install
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 9734
diff changeset 
     9
 
  No problems detected
9734
36c388a1aa51 commands: call ui.username carefully in debuginstall
Martin Geisler <mg@lazybytes.net>
parents: 4365
diff changeset 
    10
 







11917






b03cf2349a80
tests: unify test-install



Pradeepkumar Gayam <in3xes@gmail.com>


parents: 
9734

diff
changeset




    11


hg debuginstall with no username













b03cf2349a80
tests: unify test-install



Pradeepkumar Gayam <in3xes@gmail.com>


parents: 
9734

diff
changeset




    12


  $ HGUSER= hg debuginstall













b03cf2349a80
tests: unify test-install



Pradeepkumar Gayam <in3xes@gmail.com>


parents: 
9734

diff
changeset




    13


  Checking encoding (ascii)...








12376






97ffc68f71d3
tests: add glob matching for unified tests



Brodie Rao <brodie@bitheap.org>


parents: 
12375

diff
changeset




    14


  Checking installed modules (*/mercurial)... (glob)








11917






b03cf2349a80
tests: unify test-install



Pradeepkumar Gayam <in3xes@gmail.com>


parents: 
9734

diff
changeset




    15


  Checking templates...













b03cf2349a80
tests: unify test-install



Pradeepkumar Gayam <in3xes@gmail.com>


parents: 
9734

diff
changeset




    16


  Checking patch...













b03cf2349a80
tests: unify test-install



Pradeepkumar Gayam <in3xes@gmail.com>


parents: 
9734

diff
changeset




    17


  Checking commit editor...













b03cf2349a80
tests: unify test-install



Pradeepkumar Gayam <in3xes@gmail.com>


parents: 
9734

diff
changeset




    18


  Checking username...













b03cf2349a80
tests: unify test-install



Pradeepkumar Gayam <in3xes@gmail.com>


parents: 
9734

diff
changeset




    19


   no username supplied (see "hg help config")








12084






ff7c1118a83a
Merge with stable



Martin Geisler <mg@aragost.com>


parents: 
12004

diff
changeset




    20


   (specify a username in your configuration file)








11917






b03cf2349a80
tests: unify test-install



Pradeepkumar Gayam <in3xes@gmail.com>


parents: 
9734

diff
changeset




    21


  1 problems detected, please check your install!








12316






4134686b83e1
tests: add exit codes to unified tests



Matt Mackall <mpm@selenic.com>


parents: 
12084

diff
changeset




    22


  [1]















Mercurial