Mercurial Mercurial > hg-stable / 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-merge-subrepos.t
author Yuya Nishihara <yuya@tcha.org>
Sat, 05 Nov 2016 13:20:53 +0900
changeset 30311 d4db88a26ad5
parent 19803 0f64af33fb63
child 33198 439b4d005b4a
permissions -rw-r--r--
hghave: check darcs version more strictly test-convert-darcs.t suddenly started failing on my Debian sid machine. The reason was Darcs was upgraded from 2.12.0 to 2.12.4 so the original pattern got to match the last two digits. Fix the pattern to match 2.2+.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13437
6169493ac3f9 Do not allow merging with uncommitted changes in a subrepo
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
diff changeset 
     1
 
  $ hg init
6169493ac3f9 Do not allow merging with uncommitted changes in a subrepo
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
diff changeset 
     2
 












6169493ac3f9
Do not allow merging with uncommitted changes in a subrepo



Oleg Stepanov <oleg.stepanov@jetbrains.com>


parents: 

diff
changeset




     3


  $ echo a > a













6169493ac3f9
Do not allow merging with uncommitted changes in a subrepo



Oleg Stepanov <oleg.stepanov@jetbrains.com>


parents: 

diff
changeset




     4


  $ hg ci -qAm 'add a'













6169493ac3f9
Do not allow merging with uncommitted changes in a subrepo



Oleg Stepanov <oleg.stepanov@jetbrains.com>


parents: 

diff
changeset




     5














6169493ac3f9
Do not allow merging with uncommitted changes in a subrepo



Oleg Stepanov <oleg.stepanov@jetbrains.com>


parents: 

diff
changeset




     6


  $ hg init subrepo













6169493ac3f9
Do not allow merging with uncommitted changes in a subrepo



Oleg Stepanov <oleg.stepanov@jetbrains.com>


parents: 

diff
changeset




     7


  $ echo 'subrepo = http://example.net/libfoo' > .hgsub













6169493ac3f9
Do not allow merging with uncommitted changes in a subrepo



Oleg Stepanov <oleg.stepanov@jetbrains.com>


parents: 

diff
changeset




     8


  $ hg ci -qAm 'added subrepo'













6169493ac3f9
Do not allow merging with uncommitted changes in a subrepo



Oleg Stepanov <oleg.stepanov@jetbrains.com>


parents: 

diff
changeset




     9














6169493ac3f9
Do not allow merging with uncommitted changes in a subrepo



Oleg Stepanov <oleg.stepanov@jetbrains.com>


parents: 

diff
changeset




    10


  $ hg up -qC 0













6169493ac3f9
Do not allow merging with uncommitted changes in a subrepo



Oleg Stepanov <oleg.stepanov@jetbrains.com>


parents: 

diff
changeset




    11


  $ echo ax > a













6169493ac3f9
Do not allow merging with uncommitted changes in a subrepo



Oleg Stepanov <oleg.stepanov@jetbrains.com>


parents: 

diff
changeset




    12


  $ hg ci -m 'changed a'













6169493ac3f9
Do not allow merging with uncommitted changes in a subrepo



Oleg Stepanov <oleg.stepanov@jetbrains.com>


parents: 

diff
changeset




    13


  created new head













6169493ac3f9
Do not allow merging with uncommitted changes in a subrepo



Oleg Stepanov <oleg.stepanov@jetbrains.com>


parents: 

diff
changeset




    14














6169493ac3f9
Do not allow merging with uncommitted changes in a subrepo



Oleg Stepanov <oleg.stepanov@jetbrains.com>


parents: 

diff
changeset




    15


  $ hg up -qC 1













6169493ac3f9
Do not allow merging with uncommitted changes in a subrepo



Oleg Stepanov <oleg.stepanov@jetbrains.com>


parents: 

diff
changeset




    16


  $ cd subrepo













6169493ac3f9
Do not allow merging with uncommitted changes in a subrepo



Oleg Stepanov <oleg.stepanov@jetbrains.com>


parents: 

diff
changeset




    17


  $ echo b > b













6169493ac3f9
Do not allow merging with uncommitted changes in a subrepo



Oleg Stepanov <oleg.stepanov@jetbrains.com>


parents: 

diff
changeset




    18


  $ hg add b













6169493ac3f9
Do not allow merging with uncommitted changes in a subrepo



Oleg Stepanov <oleg.stepanov@jetbrains.com>


parents: 

diff
changeset




    19


  $ cd ..













6169493ac3f9
Do not allow merging with uncommitted changes in a subrepo



Oleg Stepanov <oleg.stepanov@jetbrains.com>


parents: 

diff
changeset




    20














6169493ac3f9
Do not allow merging with uncommitted changes in a subrepo



Oleg Stepanov <oleg.stepanov@jetbrains.com>


parents: 

diff
changeset




    21


Should fail, since there are added files to subrepo:













6169493ac3f9
Do not allow merging with uncommitted changes in a subrepo



Oleg Stepanov <oleg.stepanov@jetbrains.com>


parents: 

diff
changeset




    22














6169493ac3f9
Do not allow merging with uncommitted changes in a subrepo



Oleg Stepanov <oleg.stepanov@jetbrains.com>


parents: 

diff
changeset




    23


  $ hg merge








19803






0f64af33fb63
merge: standardize error message for dirty subrepo



Siddharth Agarwal <sid0@fb.com>


parents: 
13437

diff
changeset




    24


  abort: uncommitted changes in subrepository 'subrepo'








13437






6169493ac3f9
Do not allow merging with uncommitted changes in a subrepo



Oleg Stepanov <oleg.stepanov@jetbrains.com>


parents: 

diff
changeset




    25


  [255]















hg-stable