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-merge-subrepos.t
author Yuya Nishihara <yuya@tcha.org>
Mon, 29 Aug 2016 22:59:39 +0900
changeset 29873 80ba176bad62
parent 19803 0f64af33fb63
child 33196 439b4d005b4a
permissions -rw-r--r--
test-gpg: start gpg-agent by gpg-connect-agent only if GnuPG v2.1+ detected Danek Duvall found that gpg-connect-agent of GnuPG 2.0 never starts gpg-agent daemon. The 2.1 way is documented as "gpg-coonect-agent /bye" [1], which appears to be different from the 2.0 way [2]. [1]: https://www.gnupg.org/documentation/manuals/gnupg/Invoking-GPG_002dAGENT.html [2]: https://www.gnupg.org/documentation/manuals/gnupg-2.0/Invoking-GPG_002dAGENT.html Since "gpg-agent --daemon" of GnuPG 2.1 never prints environment variables, "eval $(gpg-agent --daemon)" would be valid only for GnuPG < 2.1, and we'll need a different workaround for 2.0. I have no 2.0 environment, I won't implement it.
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]















Mercurial