Mercurial > hg
annotate tests/test-sparse-with-safe-share.t @ 48584:74973a6d4e67
filemerge: always define a "base" label
It simplifies the code and improves the conflict markers to always
have the "base" label defined.
Differential Revision: https://phab.mercurial-scm.org/D12016
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 20 Jan 2022 14:13:12 -0800 |
parents | b74ee41addee |
children |
rev | line source |
---|---|
48493
50330d481640
sparse: demonstrate a bug when used with safe-share
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff
changeset
|
1 Same with share-safe |
50330d481640
sparse: demonstrate a bug when used with safe-share
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff
changeset
|
2 |
50330d481640
sparse: demonstrate a bug when used with safe-share
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff
changeset
|
3 $ echo "[format]" >> $HGRCPATH |
50330d481640
sparse: demonstrate a bug when used with safe-share
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff
changeset
|
4 $ echo "use-share-safe = True" >> $HGRCPATH |
50330d481640
sparse: demonstrate a bug when used with safe-share
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff
changeset
|
5 |
50330d481640
sparse: demonstrate a bug when used with safe-share
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff
changeset
|
6 $ cd $TESTTMP |
50330d481640
sparse: demonstrate a bug when used with safe-share
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff
changeset
|
7 |
50330d481640
sparse: demonstrate a bug when used with safe-share
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff
changeset
|
8 $ hg init myrepo |
50330d481640
sparse: demonstrate a bug when used with safe-share
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff
changeset
|
9 $ cd myrepo |
50330d481640
sparse: demonstrate a bug when used with safe-share
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff
changeset
|
10 $ cat > .hg/hgrc <<EOF |
50330d481640
sparse: demonstrate a bug when used with safe-share
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff
changeset
|
11 > [extensions] |
50330d481640
sparse: demonstrate a bug when used with safe-share
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff
changeset
|
12 > sparse= |
50330d481640
sparse: demonstrate a bug when used with safe-share
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff
changeset
|
13 > EOF |
50330d481640
sparse: demonstrate a bug when used with safe-share
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff
changeset
|
14 |
50330d481640
sparse: demonstrate a bug when used with safe-share
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff
changeset
|
15 $ echo a > show |
50330d481640
sparse: demonstrate a bug when used with safe-share
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff
changeset
|
16 $ echo x > hide |
50330d481640
sparse: demonstrate a bug when used with safe-share
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff
changeset
|
17 $ hg ci -Aqm 'initial' |
50330d481640
sparse: demonstrate a bug when used with safe-share
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff
changeset
|
18 |
48494
b74ee41addee
sparse: lock the store when updating requirements config
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48493
diff
changeset
|
19 Regression test: checks that this command correctly locks the store |
b74ee41addee
sparse: lock the store when updating requirements config
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
48493
diff
changeset
|
20 before updating the store [requirements] config. |
48493
50330d481640
sparse: demonstrate a bug when used with safe-share
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff
changeset
|
21 |
50330d481640
sparse: demonstrate a bug when used with safe-share
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff
changeset
|
22 $ hg up -q 0 |
50330d481640
sparse: demonstrate a bug when used with safe-share
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
diff
changeset
|
23 $ hg debugsparse --include 'hide' |