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 Thomas Arendsen Hein <thomas@intevation.de>
Thu, 04 Oct 2012 16:30:40 +0200
branchstable
changeset 17705 6929b9c70be9
parent 13437 6169493ac3f9
child 19803 0f64af33fb63
permissions -rw-r--r--
subrepo: setting LC_MESSAGES only works if LC_ALL is empty or unset For example LC_ALL=de_DE.utf-8 would cause the version check to fail, because "svn, Version 1.6.12 (r955767)" with a capital "V" will be printed. Using "svn --version --quiet" would only print the version number, but then matching other messages, e.g. "Committed revision" would fail.
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













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



Oleg Stepanov <oleg.stepanov@jetbrains.com>


parents: 

diff
changeset




    24


  abort: outstanding uncommitted changes in subrepository 'subrepo'













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



Oleg Stepanov <oleg.stepanov@jetbrains.com>


parents: 

diff
changeset




    25


  [255]















Mercurial