Mercurial > hg
annotate tests/test-subrepo.t @ 43629:ec53ea01c9e6
patchbomb: fix wrong argument type when calling mail generator.flatten()
author | Denis Laxalde <denis.laxalde@logilab.fr> |
---|---|
date | Wed, 13 Nov 2019 17:06:05 +0100 |
parents | 687b865b95ad |
children | 5c2a4f37eace |
rev | line source |
---|---|
15321
e174353e8cda
subrepos: abort commit by default if a subrepo is dirty (BC)
Martin Geisler <mg@lazybytes.net>
parents:
15265
diff
changeset
|
1 Let commit recurse into subrepos by default to match pre-2.0 behavior: |
e174353e8cda
subrepos: abort commit by default if a subrepo is dirty (BC)
Martin Geisler <mg@lazybytes.net>
parents:
15265
diff
changeset
|
2 |
e174353e8cda
subrepos: abort commit by default if a subrepo is dirty (BC)
Martin Geisler <mg@lazybytes.net>
parents:
15265
diff
changeset
|
3 $ echo "[ui]" >> $HGRCPATH |
e174353e8cda
subrepos: abort commit by default if a subrepo is dirty (BC)
Martin Geisler <mg@lazybytes.net>
parents:
15265
diff
changeset
|
4 $ echo "commitsubrepos = Yes" >> $HGRCPATH |
e174353e8cda
subrepos: abort commit by default if a subrepo is dirty (BC)
Martin Geisler <mg@lazybytes.net>
parents:
15265
diff
changeset
|
5 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
6 $ hg init t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
7 $ cd t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
8 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
9 first revision, no sub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
10 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
11 $ echo a > a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
12 $ hg ci -Am0 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
13 adding a |
8816 | 14 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
15 add first sub |
8816 | 16 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
17 $ echo s = s > .hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
18 $ hg add .hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
19 $ hg init s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
20 $ echo a > s/a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
21 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12376
diff
changeset
|
22 Issue2232: committing a subrepo without .hgsub |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
23 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
24 $ hg ci -mbad s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
25 abort: can't commit subrepos without .hgsub |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
26 [255] |
8816 | 27 |
24413
a8595176dd64
subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents:
24148
diff
changeset
|
28 $ hg -R s add s/a |
a8595176dd64
subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents:
24148
diff
changeset
|
29 $ hg files -S |
a8595176dd64
subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents:
24148
diff
changeset
|
30 .hgsub |
a8595176dd64
subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents:
24148
diff
changeset
|
31 a |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
32 s/a |
24413
a8595176dd64
subrepo: add basic support to hgsubrepo for the files command
Matt Harbison <matt_harbison@yahoo.com>
parents:
24148
diff
changeset
|
33 |
41747
31b84c72ada0
subrepo: demonstrate broken `hg files` with ui.relative-paths=no
Martin von Zweigbergk <martinvonz@google.com>
parents:
40807
diff
changeset
|
34 `hg files` respects ui.relative-paths |
31b84c72ada0
subrepo: demonstrate broken `hg files` with ui.relative-paths=no
Martin von Zweigbergk <martinvonz@google.com>
parents:
40807
diff
changeset
|
35 BROKEN: shows subrepo paths relative to the subrepo |
31b84c72ada0
subrepo: demonstrate broken `hg files` with ui.relative-paths=no
Martin von Zweigbergk <martinvonz@google.com>
parents:
40807
diff
changeset
|
36 $ hg files -S --config ui.relative-paths=no |
31b84c72ada0
subrepo: demonstrate broken `hg files` with ui.relative-paths=no
Martin von Zweigbergk <martinvonz@google.com>
parents:
40807
diff
changeset
|
37 .hgsub |
31b84c72ada0
subrepo: demonstrate broken `hg files` with ui.relative-paths=no
Martin von Zweigbergk <martinvonz@google.com>
parents:
40807
diff
changeset
|
38 a |
41748
980e05204ed8
subrepo: use root-repo-relative path from `hg files` with ui.relative-paths=no
Martin von Zweigbergk <martinvonz@google.com>
parents:
41747
diff
changeset
|
39 s/a |
41747
31b84c72ada0
subrepo: demonstrate broken `hg files` with ui.relative-paths=no
Martin von Zweigbergk <martinvonz@google.com>
parents:
40807
diff
changeset
|
40 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
41 $ hg -R s ci -Ams0 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
42 $ hg sum |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
43 parent: 0:f7b1eb17ad24 tip |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
44 0 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
45 branch: default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
46 commit: 1 added, 1 subrepos |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
47 update: (current) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25337
diff
changeset
|
48 phases: 1 draft |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
49 $ hg ci -m1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
50 |
20827
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
51 test handling .hgsubstate "added" explicitly. |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
52 |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
53 $ hg parents --template '{node}\n{files}\n' |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
54 7cf8cfea66e410e8e3336508dfeec07b3192de51 |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
55 .hgsub .hgsubstate |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
56 $ hg rollback -q |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
57 $ hg add .hgsubstate |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
58 $ hg ci -m1 |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
59 $ hg parents --template '{node}\n{files}\n' |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
60 7cf8cfea66e410e8e3336508dfeec07b3192de51 |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
61 .hgsub .hgsubstate |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
62 |
29622
9c2cc107547f
cmdutil: warnings not issued in remove if subrepopath overlaps
Hannes Oldenburg <hannes.christian.oldenburg@gmail.com>
parents:
28318
diff
changeset
|
63 Subrepopath which overlaps with filepath, does not change warnings in remove() |
9c2cc107547f
cmdutil: warnings not issued in remove if subrepopath overlaps
Hannes Oldenburg <hannes.christian.oldenburg@gmail.com>
parents:
28318
diff
changeset
|
64 |
9c2cc107547f
cmdutil: warnings not issued in remove if subrepopath overlaps
Hannes Oldenburg <hannes.christian.oldenburg@gmail.com>
parents:
28318
diff
changeset
|
65 $ mkdir snot |
9c2cc107547f
cmdutil: warnings not issued in remove if subrepopath overlaps
Hannes Oldenburg <hannes.christian.oldenburg@gmail.com>
parents:
28318
diff
changeset
|
66 $ touch snot/file |
9c2cc107547f
cmdutil: warnings not issued in remove if subrepopath overlaps
Hannes Oldenburg <hannes.christian.oldenburg@gmail.com>
parents:
28318
diff
changeset
|
67 $ hg remove -S snot/file |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
68 not removing snot/file: file is untracked |
29622
9c2cc107547f
cmdutil: warnings not issued in remove if subrepopath overlaps
Hannes Oldenburg <hannes.christian.oldenburg@gmail.com>
parents:
28318
diff
changeset
|
69 [1] |
29633
bc5148d0a446
cmdutil: warnings not issued in cat if subrepopath overlaps
Hannes Oldenburg <hannes.christian.oldenburg@gmail.com>
parents:
29622
diff
changeset
|
70 $ hg cat snot/filenot |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
71 snot/filenot: no such file in rev 7cf8cfea66e4 |
29633
bc5148d0a446
cmdutil: warnings not issued in cat if subrepopath overlaps
Hannes Oldenburg <hannes.christian.oldenburg@gmail.com>
parents:
29622
diff
changeset
|
72 [1] |
29622
9c2cc107547f
cmdutil: warnings not issued in remove if subrepopath overlaps
Hannes Oldenburg <hannes.christian.oldenburg@gmail.com>
parents:
28318
diff
changeset
|
73 $ rm -r snot |
9c2cc107547f
cmdutil: warnings not issued in remove if subrepopath overlaps
Hannes Oldenburg <hannes.christian.oldenburg@gmail.com>
parents:
28318
diff
changeset
|
74 |
16454
92c7e917b647
tests: add test for fileset 'subrepo' keyword
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
16430
diff
changeset
|
75 Revert subrepo and test subrepo fileset keyword: |
15265
460135339d74
revert: warn that subrepos cannot be reverted
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
15231
diff
changeset
|
76 |
460135339d74
revert: warn that subrepos cannot be reverted
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
15231
diff
changeset
|
77 $ echo b > s/a |
24134
afed5d2e7985
revert: display full subrepo output with --dry-run
Matt Harbison <matt_harbison@yahoo.com>
parents:
23971
diff
changeset
|
78 $ hg revert --dry-run "set:subrepo('glob:s*')" |
afed5d2e7985
revert: display full subrepo output with --dry-run
Matt Harbison <matt_harbison@yahoo.com>
parents:
23971
diff
changeset
|
79 reverting subrepo s |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
80 reverting s/a |
24134
afed5d2e7985
revert: display full subrepo output with --dry-run
Matt Harbison <matt_harbison@yahoo.com>
parents:
23971
diff
changeset
|
81 $ cat s/a |
afed5d2e7985
revert: display full subrepo output with --dry-run
Matt Harbison <matt_harbison@yahoo.com>
parents:
23971
diff
changeset
|
82 b |
16454
92c7e917b647
tests: add test for fileset 'subrepo' keyword
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
16430
diff
changeset
|
83 $ hg revert "set:subrepo('glob:s*')" |
16430
6883c2363f44
revert: add support for reverting subrepos without --no-backup and/or --all
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
16429
diff
changeset
|
84 reverting subrepo s |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
85 reverting s/a |
24134
afed5d2e7985
revert: display full subrepo output with --dry-run
Matt Harbison <matt_harbison@yahoo.com>
parents:
23971
diff
changeset
|
86 $ cat s/a |
afed5d2e7985
revert: display full subrepo output with --dry-run
Matt Harbison <matt_harbison@yahoo.com>
parents:
23971
diff
changeset
|
87 a |
16430
6883c2363f44
revert: add support for reverting subrepos without --no-backup and/or --all
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
16429
diff
changeset
|
88 $ rm s/a.orig |
15265
460135339d74
revert: warn that subrepos cannot be reverted
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
15231
diff
changeset
|
89 |
16430
6883c2363f44
revert: add support for reverting subrepos without --no-backup and/or --all
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
16429
diff
changeset
|
90 Revert subrepo with no backup. The "reverting s/a" line is gone since |
6883c2363f44
revert: add support for reverting subrepos without --no-backup and/or --all
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
16429
diff
changeset
|
91 we're really running 'hg update' in the subrepo: |
6883c2363f44
revert: add support for reverting subrepos without --no-backup and/or --all
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
16429
diff
changeset
|
92 |
6883c2363f44
revert: add support for reverting subrepos without --no-backup and/or --all
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
16429
diff
changeset
|
93 $ echo b > s/a |
6883c2363f44
revert: add support for reverting subrepos without --no-backup and/or --all
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
16429
diff
changeset
|
94 $ hg revert --no-backup s |
6883c2363f44
revert: add support for reverting subrepos without --no-backup and/or --all
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
16429
diff
changeset
|
95 reverting subrepo s |
15265
460135339d74
revert: warn that subrepos cannot be reverted
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
15231
diff
changeset
|
96 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12376
diff
changeset
|
97 Issue2022: update -C |
11485
b602a95c21ec
subrepo: refuse to commit subrepos if .hgsub is excluded (issue2232)
Matt Mackall <mpm@selenic.com>
parents:
11470
diff
changeset
|
98 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
99 $ echo b > s/a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
100 $ hg sum |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
101 parent: 1:7cf8cfea66e4 tip |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
102 1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
103 branch: default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
104 commit: 1 subrepos |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
105 update: (current) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25337
diff
changeset
|
106 phases: 2 draft |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
107 $ hg co -C 1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
108 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
109 $ hg sum |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
110 parent: 1:7cf8cfea66e4 tip |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
111 1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
112 branch: default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
113 commit: (clean) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
114 update: (current) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25337
diff
changeset
|
115 phases: 2 draft |
11485
b602a95c21ec
subrepo: refuse to commit subrepos if .hgsub is excluded (issue2232)
Matt Mackall <mpm@selenic.com>
parents:
11470
diff
changeset
|
116 |
15231
cd6f10dccf16
cmdutil.bailifchanged: abort for dirty subrepos
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
14536
diff
changeset
|
117 commands that require a clean repo should respect subrepos |
cd6f10dccf16
cmdutil.bailifchanged: abort for dirty subrepos
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
14536
diff
changeset
|
118 |
cd6f10dccf16
cmdutil.bailifchanged: abort for dirty subrepos
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
14536
diff
changeset
|
119 $ echo b >> s/a |
cd6f10dccf16
cmdutil.bailifchanged: abort for dirty subrepos
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
14536
diff
changeset
|
120 $ hg backout tip |
33365
6d88468d435b
subrepo: make the output references to subrepositories consistent
Matt Harbison <matt_harbison@yahoo.com>
parents:
32698
diff
changeset
|
121 abort: uncommitted changes in subrepository "s" |
15231
cd6f10dccf16
cmdutil.bailifchanged: abort for dirty subrepos
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
14536
diff
changeset
|
122 [255] |
cd6f10dccf16
cmdutil.bailifchanged: abort for dirty subrepos
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
14536
diff
changeset
|
123 $ hg revert -C -R s s/a |
cd6f10dccf16
cmdutil.bailifchanged: abort for dirty subrepos
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
14536
diff
changeset
|
124 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
125 add sub sub |
8816 | 126 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
127 $ echo ss = ss > s/.hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
128 $ hg init s/ss |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
129 $ echo a > s/ss/a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
130 $ hg -R s add s/.hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
131 $ hg -R s/ss add s/ss/a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
132 $ hg sum |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
133 parent: 1:7cf8cfea66e4 tip |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
134 1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
135 branch: default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
136 commit: 1 subrepos |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
137 update: (current) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25337
diff
changeset
|
138 phases: 2 draft |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
139 $ hg ci -m2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
140 committing subrepository s |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
141 committing subrepository s/ss |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
142 $ hg sum |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
143 parent: 2:df30734270ae tip |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
144 2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
145 branch: default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
146 commit: (clean) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
147 update: (current) |
25382
6084926366b9
summary: move the parents phase marker to commit line (issue4688)
Gilles Moris <gilles.moris@free.fr>
parents:
25337
diff
changeset
|
148 phases: 3 draft |
11470
34e33d50c26b
subrepo: correctly handle update -C with modified subrepos (issue2022)
Matt Mackall <mpm@selenic.com>
parents:
11088
diff
changeset
|
149 |
20827
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
150 test handling .hgsubstate "modified" explicitly. |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
151 |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
152 $ hg parents --template '{node}\n{files}\n' |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
153 df30734270ae757feb35e643b7018e818e78a9aa |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
154 .hgsubstate |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
155 $ hg rollback -q |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
156 $ hg status -A .hgsubstate |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
157 M .hgsubstate |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
158 $ hg ci -m2 |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
159 $ hg parents --template '{node}\n{files}\n' |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
160 df30734270ae757feb35e643b7018e818e78a9aa |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
161 .hgsubstate |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
162 |
13411
d4de90a612f7
commit: abort if a subrepo is modified and ui.commitsubrepos=no
Patrick Mezard <pmezard@gmail.com>
parents:
13322
diff
changeset
|
163 bump sub rev (and check it is ignored by ui.commitsubrepos) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
164 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
165 $ echo b > s/a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
166 $ hg -R s ci -ms1 |
13411
d4de90a612f7
commit: abort if a subrepo is modified and ui.commitsubrepos=no
Patrick Mezard <pmezard@gmail.com>
parents:
13322
diff
changeset
|
167 $ hg --config ui.commitsubrepos=no ci -m3 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
168 |
13411
d4de90a612f7
commit: abort if a subrepo is modified and ui.commitsubrepos=no
Patrick Mezard <pmezard@gmail.com>
parents:
13322
diff
changeset
|
169 leave sub dirty (and check ui.commitsubrepos=no aborts the commit) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
170 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
171 $ echo c > s/a |
13411
d4de90a612f7
commit: abort if a subrepo is modified and ui.commitsubrepos=no
Patrick Mezard <pmezard@gmail.com>
parents:
13322
diff
changeset
|
172 $ hg --config ui.commitsubrepos=no ci -m4 |
33365
6d88468d435b
subrepo: make the output references to subrepositories consistent
Matt Harbison <matt_harbison@yahoo.com>
parents:
32698
diff
changeset
|
173 abort: uncommitted changes in subrepository "s" |
15321
e174353e8cda
subrepos: abort commit by default if a subrepo is dirty (BC)
Martin Geisler <mg@lazybytes.net>
parents:
15265
diff
changeset
|
174 (use --subrepos for recursive commit) |
13411
d4de90a612f7
commit: abort if a subrepo is modified and ui.commitsubrepos=no
Patrick Mezard <pmezard@gmail.com>
parents:
13322
diff
changeset
|
175 [255] |
17255
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
176 $ hg id |
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
177 f6affe3fbfaa+ tip |
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
178 $ hg -R s ci -mc |
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
179 $ hg id |
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
180 f6affe3fbfaa+ tip |
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
181 $ echo d > s/a |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
182 $ hg ci -m4 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
183 committing subrepository s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
184 $ hg tip -R s |
17255
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
185 changeset: 4:02dcf1d70411 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
186 tag: tip |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
187 user: test |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
188 date: Thu Jan 01 00:00:00 1970 +0000 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
189 summary: 4 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
190 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
191 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
192 check caching |
8816 | 193 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
194 $ hg co 0 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
195 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
196 $ hg debugsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
197 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
198 restore |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
199 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
200 $ hg co |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
201 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
202 $ hg debugsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
203 path s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
204 source s |
17255
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
205 revision 02dcf1d704118aee3ee306ccfa1910850d5b05ef |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
206 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
207 new branch for merge tests |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
208 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
209 $ hg co 1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
210 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
211 $ echo t = t >> .hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
212 $ hg init t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
213 $ echo t > t/t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
214 $ hg -R t add t |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
215 adding t/t |
8816 | 216 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
217 5 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
218 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
219 $ hg ci -m5 # add sub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
220 committing subrepository t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
221 created new head |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
222 $ echo t2 > t/t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
223 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
224 6 |
8816 | 225 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
226 $ hg st -R s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
227 $ hg ci -m6 # change sub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
228 committing subrepository t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
229 $ hg debugsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
230 path s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
231 source s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
232 revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
233 path t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
234 source t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
235 revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
236 $ echo t3 > t/t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
237 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
238 7 |
8816 | 239 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
240 $ hg ci -m7 # change sub again for conflict test |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
241 committing subrepository t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
242 $ hg rm .hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
243 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
244 8 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
245 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
246 $ hg ci -m8 # remove sub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
247 |
20827
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
248 test handling .hgsubstate "removed" explicitly. |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
249 |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
250 $ hg parents --template '{node}\n{files}\n' |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
251 96615c1dad2dc8e3796d7332c77ce69156f7b78e |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
252 .hgsub .hgsubstate |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
253 $ hg rollback -q |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
254 $ hg remove .hgsubstate |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
255 $ hg ci -m8 |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
256 $ hg parents --template '{node}\n{files}\n' |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
257 96615c1dad2dc8e3796d7332c77ce69156f7b78e |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
258 .hgsub .hgsubstate |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
259 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
260 merge tests |
8816 | 261 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
262 $ hg co -C 3 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
263 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
264 $ hg merge 5 # test adding |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
265 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
266 (branch merge, don't forget to commit) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
267 $ hg debugsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
268 path s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
269 source s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
270 revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
271 path t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
272 source t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
273 revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
274 $ hg ci -m9 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
275 created new head |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
276 $ hg merge 6 --debug # test change |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
277 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18556
diff
changeset
|
278 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
15623
diff
changeset
|
279 ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4 |
28318
564a354f7f35
tests: flag Windows specific lines about background closing as optional
Matt Harbison <matt_harbison@yahoo.com>
parents:
28029
diff
changeset
|
280 starting 4 threads for background file closing (?) |
26618
8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
281 .hgsubstate: versions differ -> m (premerge) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
282 subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
283 subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
284 getting subrepo t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
285 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18556
diff
changeset
|
286 branchmerge: False, force: False, partial: False |
17895
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
287 ancestor: 60ca1237c194, local: 60ca1237c194+, remote: 6747d179aa9a |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
288 t: remote is newer -> g |
18631
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18612
diff
changeset
|
289 getting t |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
290 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
291 (branch merge, don't forget to commit) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
292 $ hg debugsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
293 path s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
294 source s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
295 revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
296 path t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
297 source t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
298 revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
299 $ echo conflict > t/t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
300 $ hg ci -m10 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
301 committing subrepository t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
302 $ HGMERGE=internal:merge hg merge --debug 7 # test conflict |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
303 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18556
diff
changeset
|
304 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
15623
diff
changeset
|
305 ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf |
28318
564a354f7f35
tests: flag Windows specific lines about background closing as optional
Matt Harbison <matt_harbison@yahoo.com>
parents:
28029
diff
changeset
|
306 starting 4 threads for background file closing (?) |
26618
8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
307 .hgsubstate: versions differ -> m (premerge) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
308 subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4 |
19811
5e10d41e7b9c
merge: let the user choose to merge, keep local or keep remote subrepo revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
19225
diff
changeset
|
309 subrepo t: both sides changed |
5e10d41e7b9c
merge: let the user choose to merge, keep local or keep remote subrepo revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
19225
diff
changeset
|
310 subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198) |
30060
a145161debed
merge: use labels in subrepo merge
Simon Farnsworth <simonfar@fb.com>
parents:
29973
diff
changeset
|
311 starting 4 threads for background file closing (?) |
42588
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
312 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev]. |
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
313 what do you want to do? m |
33365
6d88468d435b
subrepo: make the output references to subrepositories consistent
Matt Harbison <matt_harbison@yahoo.com>
parents:
32698
diff
changeset
|
314 merging subrepository "t" |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
315 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18556
diff
changeset
|
316 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
15623
diff
changeset
|
317 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 |
42605
5c36a7e4912a
tests: properly position conditional output on Windows in test-subrepo.t
Matt Harbison <matt_harbison@yahoo.com>
parents:
42588
diff
changeset
|
318 preserving t for resolve of t |
42588
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
319 starting 4 threads for background file closing (?) |
26618
8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
320 t: versions differ -> m (premerge) |
27161
296d55def9c4
filemerge: add debug output for whether this is a change/delete conflict
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
321 picked tool ':merge' for t (binary False symlink False changedelete False) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
322 merging t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
323 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
26618
8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
324 t: versions differ -> m (merge) |
27161
296d55def9c4
filemerge: add debug output for whether this is a change/delete conflict
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
325 picked tool ':merge' for t (binary False symlink False changedelete False) |
26611
a5ff66e6d77a
filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents:
26587
diff
changeset
|
326 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26611
diff
changeset
|
327 warning: conflicts while merging t! (edit, then use 'hg resolve --mark') |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
328 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
329 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
19811
5e10d41e7b9c
merge: let the user choose to merge, keep local or keep remote subrepo revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
19225
diff
changeset
|
330 subrepo t: merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
331 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
332 (branch merge, don't forget to commit) |
8816 | 333 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
334 should conflict |
8816 | 335 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
336 $ cat t/t |
21693
9c35f3a8cac4
merge: drop the quotes around commit description
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21519
diff
changeset
|
337 <<<<<<< local: 20a0db6fbf6c - test: 10 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
338 conflict |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
339 ======= |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
340 t3 |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
341 >>>>>>> other: 7af322bc1198 - test: 7 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
342 |
24110
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
343 11: remove subrepo t |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
344 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
345 $ hg co -C 5 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
346 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
347 $ hg revert -r 4 .hgsub # remove t |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
348 $ hg ci -m11 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
349 created new head |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
350 $ hg debugsub |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
351 path s |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
352 source s |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
353 revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
354 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
355 local removed, remote changed, keep changed |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
356 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
357 $ hg merge 6 |
31516
2915cc1d3429
subrepo: move prompts out of the if (issue5505)
Simon Farnsworth <simonfar@fb.com>
parents:
30732
diff
changeset
|
358 remote [merge rev] changed subrepository t which local [working copy] removed |
24110
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
359 use (c)hanged version or (d)elete? c |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
360 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
361 (branch merge, don't forget to commit) |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
362 BROKEN: should include subrepo t |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
363 $ hg debugsub |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
364 path s |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
365 source s |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
366 revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
367 $ cat .hgsubstate |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
368 e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
369 6747d179aa9a688023c4b0cad32e4c92bb7f34ad t |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
370 $ hg ci -m 'local removed, remote changed, keep changed' |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
371 BROKEN: should include subrepo t |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
372 $ hg debugsub |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
373 path s |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
374 source s |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
375 revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
376 BROKEN: should include subrepo t |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
377 $ cat .hgsubstate |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
378 e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
379 $ cat t/t |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
380 t2 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
381 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
382 local removed, remote changed, keep removed |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
383 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
384 $ hg co -C 11 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
385 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
386 $ hg merge --config ui.interactive=true 6 <<EOF |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
387 > d |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
388 > EOF |
31516
2915cc1d3429
subrepo: move prompts out of the if (issue5505)
Simon Farnsworth <simonfar@fb.com>
parents:
30732
diff
changeset
|
389 remote [merge rev] changed subrepository t which local [working copy] removed |
24110
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
390 use (c)hanged version or (d)elete? d |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
391 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
392 (branch merge, don't forget to commit) |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
393 $ hg debugsub |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
394 path s |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
395 source s |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
396 revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
397 $ cat .hgsubstate |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
398 e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
399 $ hg ci -m 'local removed, remote changed, keep removed' |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
400 created new head |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
401 $ hg debugsub |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
402 path s |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
403 source s |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
404 revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
405 $ cat .hgsubstate |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
406 e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
407 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
408 local changed, remote removed, keep changed |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
409 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
410 $ hg co -C 6 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
411 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
412 $ hg merge 11 |
31516
2915cc1d3429
subrepo: move prompts out of the if (issue5505)
Simon Farnsworth <simonfar@fb.com>
parents:
30732
diff
changeset
|
413 local [working copy] changed subrepository t which remote [merge rev] removed |
24110
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
414 use (c)hanged version or (d)elete? c |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
415 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
416 (branch merge, don't forget to commit) |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
417 BROKEN: should include subrepo t |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
418 $ hg debugsub |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
419 path s |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
420 source s |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
421 revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
422 BROKEN: should include subrepo t |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
423 $ cat .hgsubstate |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
424 e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
425 $ hg ci -m 'local changed, remote removed, keep changed' |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
426 created new head |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
427 BROKEN: should include subrepo t |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
428 $ hg debugsub |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
429 path s |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
430 source s |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
431 revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
432 BROKEN: should include subrepo t |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
433 $ cat .hgsubstate |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
434 e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
435 $ cat t/t |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
436 t2 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
437 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
438 local changed, remote removed, keep removed |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
439 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
440 $ hg co -C 6 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
441 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
442 $ hg merge --config ui.interactive=true 11 <<EOF |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
443 > d |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
444 > EOF |
31516
2915cc1d3429
subrepo: move prompts out of the if (issue5505)
Simon Farnsworth <simonfar@fb.com>
parents:
30732
diff
changeset
|
445 local [working copy] changed subrepository t which remote [merge rev] removed |
24110
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
446 use (c)hanged version or (d)elete? d |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
447 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
448 (branch merge, don't forget to commit) |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
449 $ hg debugsub |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
450 path s |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
451 source s |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
452 revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
453 $ cat .hgsubstate |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
454 e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
455 $ hg ci -m 'local changed, remote removed, keep removed' |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
456 created new head |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
457 $ hg debugsub |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
458 path s |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
459 source s |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
460 revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
461 $ cat .hgsubstate |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
462 e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
463 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
464 clean up to avoid having to fix up the tests below |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
465 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
466 $ hg co -C 10 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
467 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
468 $ cat >> $HGRCPATH <<EOF |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
469 > [extensions] |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
470 > strip= |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
471 > EOF |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
472 $ hg strip -r 11:15 |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
473 saved backup bundle to $TESTTMP/t/.hg/strip-backup/*-backup.hg (glob) |
756c5c8331b0
subrepo: add tests for change/remove conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
23971
diff
changeset
|
474 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
475 clone |
8816 | 476 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
477 $ cd .. |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
478 $ hg clone t tc |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
479 updating to branch default |
18720
0ade08dcb3c3
tests: remove glob lines which unnecessary match / for \ on windows
Simon Heimberg <simohe@besonet.ch>
parents:
18631
diff
changeset
|
480 cloning subrepo s from $TESTTMP/t/s |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
481 cloning subrepo s/ss from $TESTTMP/t/s/ss |
18720
0ade08dcb3c3
tests: remove glob lines which unnecessary match / for \ on windows
Simon Heimberg <simohe@besonet.ch>
parents:
18631
diff
changeset
|
482 cloning subrepo t from $TESTTMP/t/t |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
483 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
484 $ cd tc |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
485 $ hg debugsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
486 path s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
487 source s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
488 revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
489 path t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
490 source t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
491 revision 20a0db6fbf6c3d2836e6519a642ae929bfc67c0e |
34985
5e27afeddaee
subrepo: add config option to reject any subrepo operations (SEC)
Yuya Nishihara <yuya@tcha.org>
parents:
34815
diff
changeset
|
492 $ cd .. |
5e27afeddaee
subrepo: add config option to reject any subrepo operations (SEC)
Yuya Nishihara <yuya@tcha.org>
parents:
34815
diff
changeset
|
493 |
5e27afeddaee
subrepo: add config option to reject any subrepo operations (SEC)
Yuya Nishihara <yuya@tcha.org>
parents:
34815
diff
changeset
|
494 clone with subrepo disabled (update should fail) |
5e27afeddaee
subrepo: add config option to reject any subrepo operations (SEC)
Yuya Nishihara <yuya@tcha.org>
parents:
34815
diff
changeset
|
495 |
34989
1a314176da9c
subrepo: use per-type config options to enable subrepos
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34986
diff
changeset
|
496 $ hg clone t -U tc2 --config subrepos.allowed=false |
1a314176da9c
subrepo: use per-type config options to enable subrepos
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34986
diff
changeset
|
497 $ hg update -R tc2 --config subrepos.allowed=false |
1a314176da9c
subrepo: use per-type config options to enable subrepos
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34986
diff
changeset
|
498 abort: subrepos not enabled |
34985
5e27afeddaee
subrepo: add config option to reject any subrepo operations (SEC)
Yuya Nishihara <yuya@tcha.org>
parents:
34815
diff
changeset
|
499 (see 'hg help config.subrepos' for details) |
5e27afeddaee
subrepo: add config option to reject any subrepo operations (SEC)
Yuya Nishihara <yuya@tcha.org>
parents:
34815
diff
changeset
|
500 [255] |
5e27afeddaee
subrepo: add config option to reject any subrepo operations (SEC)
Yuya Nishihara <yuya@tcha.org>
parents:
34815
diff
changeset
|
501 $ ls tc2 |
5e27afeddaee
subrepo: add config option to reject any subrepo operations (SEC)
Yuya Nishihara <yuya@tcha.org>
parents:
34815
diff
changeset
|
502 a |
5e27afeddaee
subrepo: add config option to reject any subrepo operations (SEC)
Yuya Nishihara <yuya@tcha.org>
parents:
34815
diff
changeset
|
503 |
34989
1a314176da9c
subrepo: use per-type config options to enable subrepos
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34986
diff
changeset
|
504 $ hg clone t tc3 --config subrepos.allowed=false |
34985
5e27afeddaee
subrepo: add config option to reject any subrepo operations (SEC)
Yuya Nishihara <yuya@tcha.org>
parents:
34815
diff
changeset
|
505 updating to branch default |
34989
1a314176da9c
subrepo: use per-type config options to enable subrepos
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34986
diff
changeset
|
506 abort: subrepos not enabled |
34985
5e27afeddaee
subrepo: add config option to reject any subrepo operations (SEC)
Yuya Nishihara <yuya@tcha.org>
parents:
34815
diff
changeset
|
507 (see 'hg help config.subrepos' for details) |
5e27afeddaee
subrepo: add config option to reject any subrepo operations (SEC)
Yuya Nishihara <yuya@tcha.org>
parents:
34815
diff
changeset
|
508 [255] |
5e27afeddaee
subrepo: add config option to reject any subrepo operations (SEC)
Yuya Nishihara <yuya@tcha.org>
parents:
34815
diff
changeset
|
509 $ ls tc3 |
5e27afeddaee
subrepo: add config option to reject any subrepo operations (SEC)
Yuya Nishihara <yuya@tcha.org>
parents:
34815
diff
changeset
|
510 a |
8816 | 511 |
34989
1a314176da9c
subrepo: use per-type config options to enable subrepos
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34986
diff
changeset
|
512 And again with just the hg type disabled |
1a314176da9c
subrepo: use per-type config options to enable subrepos
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34986
diff
changeset
|
513 |
1a314176da9c
subrepo: use per-type config options to enable subrepos
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34986
diff
changeset
|
514 $ hg clone t -U tc4 --config subrepos.hg:allowed=false |
1a314176da9c
subrepo: use per-type config options to enable subrepos
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34986
diff
changeset
|
515 $ hg update -R tc4 --config subrepos.hg:allowed=false |
1a314176da9c
subrepo: use per-type config options to enable subrepos
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34986
diff
changeset
|
516 abort: hg subrepos not allowed |
34986
828cf35f1de6
subrepo: extend config option to disable subrepos by type (SEC)
Yuya Nishihara <yuya@tcha.org>
parents:
34985
diff
changeset
|
517 (see 'hg help config.subrepos' for details) |
828cf35f1de6
subrepo: extend config option to disable subrepos by type (SEC)
Yuya Nishihara <yuya@tcha.org>
parents:
34985
diff
changeset
|
518 [255] |
828cf35f1de6
subrepo: extend config option to disable subrepos by type (SEC)
Yuya Nishihara <yuya@tcha.org>
parents:
34985
diff
changeset
|
519 $ ls tc4 |
828cf35f1de6
subrepo: extend config option to disable subrepos by type (SEC)
Yuya Nishihara <yuya@tcha.org>
parents:
34985
diff
changeset
|
520 a |
828cf35f1de6
subrepo: extend config option to disable subrepos by type (SEC)
Yuya Nishihara <yuya@tcha.org>
parents:
34985
diff
changeset
|
521 |
34989
1a314176da9c
subrepo: use per-type config options to enable subrepos
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34986
diff
changeset
|
522 $ hg clone t tc5 --config subrepos.hg:allowed=false |
1a314176da9c
subrepo: use per-type config options to enable subrepos
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34986
diff
changeset
|
523 updating to branch default |
1a314176da9c
subrepo: use per-type config options to enable subrepos
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34986
diff
changeset
|
524 abort: hg subrepos not allowed |
1a314176da9c
subrepo: use per-type config options to enable subrepos
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34986
diff
changeset
|
525 (see 'hg help config.subrepos' for details) |
1a314176da9c
subrepo: use per-type config options to enable subrepos
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34986
diff
changeset
|
526 [255] |
1a314176da9c
subrepo: use per-type config options to enable subrepos
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34986
diff
changeset
|
527 $ ls tc5 |
1a314176da9c
subrepo: use per-type config options to enable subrepos
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34986
diff
changeset
|
528 a |
1a314176da9c
subrepo: use per-type config options to enable subrepos
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34986
diff
changeset
|
529 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
530 push |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
531 |
34985
5e27afeddaee
subrepo: add config option to reject any subrepo operations (SEC)
Yuya Nishihara <yuya@tcha.org>
parents:
34815
diff
changeset
|
532 $ cd tc |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
533 $ echo bah > t/t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
534 $ hg ci -m11 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
535 committing subrepository t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
536 $ hg push |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
537 pushing to $TESTTMP/t |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
538 no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss |
18941
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
539 no changes made to subrepo s since last push to $TESTTMP/t/s |
18720
0ade08dcb3c3
tests: remove glob lines which unnecessary match / for \ on windows
Simon Heimberg <simohe@besonet.ch>
parents:
18631
diff
changeset
|
540 pushing subrepo t to $TESTTMP/t/t |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
541 searching for changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
542 adding changesets |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
543 adding manifests |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
544 adding file changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
545 added 1 changesets with 1 changes to 1 files |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
546 searching for changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
547 adding changesets |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
548 adding manifests |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
549 adding file changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
550 added 1 changesets with 1 changes to 1 files |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
551 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
552 push -f |
10251
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8816
diff
changeset
|
553 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
554 $ echo bah > s/a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
555 $ hg ci -m12 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
556 committing subrepository s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
557 $ hg push |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
558 pushing to $TESTTMP/t |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
559 no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss |
18720
0ade08dcb3c3
tests: remove glob lines which unnecessary match / for \ on windows
Simon Heimberg <simohe@besonet.ch>
parents:
18631
diff
changeset
|
560 pushing subrepo s to $TESTTMP/t/s |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
561 searching for changes |
33365
6d88468d435b
subrepo: make the output references to subrepositories consistent
Matt Harbison <matt_harbison@yahoo.com>
parents:
32698
diff
changeset
|
562 abort: push creates new remote head 12a213df6fa9! (in subrepository "s") |
29973
4ddb05751b12
discovery: use single quotes in use warning
timeless <timeless@mozdev.org>
parents:
29688
diff
changeset
|
563 (merge or see 'hg help push' for details about pushing new heads) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
564 [255] |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
565 $ hg push -f |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
566 pushing to $TESTTMP/t |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
567 pushing subrepo s/ss to $TESTTMP/t/s/ss |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
568 searching for changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
569 no changes found |
18720
0ade08dcb3c3
tests: remove glob lines which unnecessary match / for \ on windows
Simon Heimberg <simohe@besonet.ch>
parents:
18631
diff
changeset
|
570 pushing subrepo s to $TESTTMP/t/s |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
571 searching for changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
572 adding changesets |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
573 adding manifests |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
574 adding file changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
575 added 1 changesets with 1 changes to 1 files (+1 heads) |
18720
0ade08dcb3c3
tests: remove glob lines which unnecessary match / for \ on windows
Simon Heimberg <simohe@besonet.ch>
parents:
18631
diff
changeset
|
576 pushing subrepo t to $TESTTMP/t/t |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
577 searching for changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
578 no changes found |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
579 searching for changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
580 adding changesets |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
581 adding manifests |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
582 adding file changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
583 added 1 changesets with 1 changes to 1 files |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
584 |
18941
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
585 check that unmodified subrepos are not pushed |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
586 |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
587 $ hg clone . ../tcc |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
588 updating to branch default |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
589 cloning subrepo s from $TESTTMP/tc/s |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
590 cloning subrepo s/ss from $TESTTMP/tc/s/ss |
18941
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
591 cloning subrepo t from $TESTTMP/tc/t |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
592 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
593 |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
594 the subrepos on the new clone have nothing to push to its source |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
595 |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
596 $ hg push -R ../tcc . |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
597 pushing to . |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
598 no changes made to subrepo s/ss since last push to s/ss |
18941
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
599 no changes made to subrepo s since last push to s |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
600 no changes made to subrepo t since last push to t |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
601 searching for changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
602 no changes found |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
603 [1] |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
604 |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
605 the subrepos on the source do not have a clean store versus the clone target |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
606 because they were never explicitly pushed to the source |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
607 |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
608 $ hg push ../tcc |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
609 pushing to ../tcc |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
610 pushing subrepo s/ss to ../tcc/s/ss |
18941
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
611 searching for changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
612 no changes found |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
613 pushing subrepo s to ../tcc/s |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
614 searching for changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
615 no changes found |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
616 pushing subrepo t to ../tcc/t |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
617 searching for changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
618 no changes found |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
619 searching for changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
620 no changes found |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
621 [1] |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
622 |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
623 after push their stores become clean |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
624 |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
625 $ hg push ../tcc |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
626 pushing to ../tcc |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
627 no changes made to subrepo s/ss since last push to ../tcc/s/ss |
18941
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
628 no changes made to subrepo s since last push to ../tcc/s |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
629 no changes made to subrepo t since last push to ../tcc/t |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
630 searching for changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
631 no changes found |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
632 [1] |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
633 |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
634 updating a subrepo to a different revision or changing |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
635 its working directory does not make its store dirty |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
636 |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
637 $ hg -R s update '.^' |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
638 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
639 $ hg push |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
640 pushing to $TESTTMP/t |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
641 no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss |
18941
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
642 no changes made to subrepo s since last push to $TESTTMP/t/s |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
643 no changes made to subrepo t since last push to $TESTTMP/t/t |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
644 searching for changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
645 no changes found |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
646 [1] |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
647 $ echo foo >> s/a |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
648 $ hg push |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
649 pushing to $TESTTMP/t |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
650 no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss |
18941
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
651 no changes made to subrepo s since last push to $TESTTMP/t/s |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
652 no changes made to subrepo t since last push to $TESTTMP/t/t |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
653 searching for changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
654 no changes found |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
655 [1] |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
656 $ hg -R s update -C tip |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
657 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
658 |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
659 committing into a subrepo makes its store (but not its parent's store) dirty |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
660 |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
661 $ echo foo >> s/ss/a |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
662 $ hg -R s/ss commit -m 'test dirty store detection' |
24875
5135c2be6959
subrepo: don't pass the outer repo's --rev or --branch to subrepo outgoing()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24858
diff
changeset
|
663 |
5135c2be6959
subrepo: don't pass the outer repo's --rev or --branch to subrepo outgoing()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24858
diff
changeset
|
664 $ hg out -S -r `hg log -r tip -T "{node|short}"` |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
665 comparing with $TESTTMP/t |
24875
5135c2be6959
subrepo: don't pass the outer repo's --rev or --branch to subrepo outgoing()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24858
diff
changeset
|
666 searching for changes |
5135c2be6959
subrepo: don't pass the outer repo's --rev or --branch to subrepo outgoing()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24858
diff
changeset
|
667 no changes found |
5135c2be6959
subrepo: don't pass the outer repo's --rev or --branch to subrepo outgoing()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24858
diff
changeset
|
668 comparing with $TESTTMP/t/s |
5135c2be6959
subrepo: don't pass the outer repo's --rev or --branch to subrepo outgoing()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24858
diff
changeset
|
669 searching for changes |
5135c2be6959
subrepo: don't pass the outer repo's --rev or --branch to subrepo outgoing()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24858
diff
changeset
|
670 no changes found |
5135c2be6959
subrepo: don't pass the outer repo's --rev or --branch to subrepo outgoing()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24858
diff
changeset
|
671 comparing with $TESTTMP/t/s/ss |
5135c2be6959
subrepo: don't pass the outer repo's --rev or --branch to subrepo outgoing()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24858
diff
changeset
|
672 searching for changes |
5135c2be6959
subrepo: don't pass the outer repo's --rev or --branch to subrepo outgoing()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24858
diff
changeset
|
673 changeset: 1:79ea5566a333 |
5135c2be6959
subrepo: don't pass the outer repo's --rev or --branch to subrepo outgoing()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24858
diff
changeset
|
674 tag: tip |
5135c2be6959
subrepo: don't pass the outer repo's --rev or --branch to subrepo outgoing()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24858
diff
changeset
|
675 user: test |
5135c2be6959
subrepo: don't pass the outer repo's --rev or --branch to subrepo outgoing()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24858
diff
changeset
|
676 date: Thu Jan 01 00:00:00 1970 +0000 |
5135c2be6959
subrepo: don't pass the outer repo's --rev or --branch to subrepo outgoing()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24858
diff
changeset
|
677 summary: test dirty store detection |
5135c2be6959
subrepo: don't pass the outer repo's --rev or --branch to subrepo outgoing()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24858
diff
changeset
|
678 |
5135c2be6959
subrepo: don't pass the outer repo's --rev or --branch to subrepo outgoing()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24858
diff
changeset
|
679 comparing with $TESTTMP/t/t |
5135c2be6959
subrepo: don't pass the outer repo's --rev or --branch to subrepo outgoing()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24858
diff
changeset
|
680 searching for changes |
5135c2be6959
subrepo: don't pass the outer repo's --rev or --branch to subrepo outgoing()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24858
diff
changeset
|
681 no changes found |
5135c2be6959
subrepo: don't pass the outer repo's --rev or --branch to subrepo outgoing()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24858
diff
changeset
|
682 |
18941
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
683 $ hg push |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
684 pushing to $TESTTMP/t |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
685 pushing subrepo s/ss to $TESTTMP/t/s/ss |
18941
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
686 searching for changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
687 adding changesets |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
688 adding manifests |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
689 adding file changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
690 added 1 changesets with 1 changes to 1 files |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
691 no changes made to subrepo s since last push to $TESTTMP/t/s |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
692 no changes made to subrepo t since last push to $TESTTMP/t/t |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
693 searching for changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
694 no changes found |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
695 [1] |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
696 |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
697 a subrepo store may be clean versus one repo but not versus another |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
698 |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
699 $ hg push |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
700 pushing to $TESTTMP/t |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
701 no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss |
18941
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
702 no changes made to subrepo s since last push to $TESTTMP/t/s |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
703 no changes made to subrepo t since last push to $TESTTMP/t/t |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
704 searching for changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
705 no changes found |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
706 [1] |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
707 $ hg push ../tcc |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
708 pushing to ../tcc |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
709 pushing subrepo s/ss to ../tcc/s/ss |
18941
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
710 searching for changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
711 adding changesets |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
712 adding manifests |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
713 adding file changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
714 added 1 changesets with 1 changes to 1 files |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
715 no changes made to subrepo s since last push to ../tcc/s |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
716 no changes made to subrepo t since last push to ../tcc/t |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
717 searching for changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
718 no changes found |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
719 [1] |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
720 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
721 update |
10177
5ca0d220ae21
subrepo: add table-based dispatch for subrepo types
Augie Fackler <durin42@gmail.com>
parents:
8816
diff
changeset
|
722 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
723 $ cd ../t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
724 $ hg up -C # discard our earlier merge |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
725 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
32698
1b5c61d38a52
update: show the commit to which we updated in case of multiple heads (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32678
diff
changeset
|
726 updated to "c373c8102e68: 12" |
28029
72072cfc7e91
update: warn about other topological heads on bare update
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27890
diff
changeset
|
727 2 other heads for branch "default" |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
728 $ echo blah > t/t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
729 $ hg ci -m13 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
730 committing subrepository t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
731 |
18943
27e8dfc2c338
subrepo: fix exception on revert when "all" option is omitted
Yuya Nishihara <yuya@tcha.org>
parents:
18941
diff
changeset
|
732 backout calls revert internally with minimal opts, which should not raise |
27e8dfc2c338
subrepo: fix exception on revert when "all" option is omitted
Yuya Nishihara <yuya@tcha.org>
parents:
18941
diff
changeset
|
733 KeyError |
27e8dfc2c338
subrepo: fix exception on revert when "all" option is omitted
Yuya Nishihara <yuya@tcha.org>
parents:
18941
diff
changeset
|
734 |
27890
ce76c4d2b85c
backout: commit changeset by default (BC)
Ruslan Sayfutdinov <sayfutdinov@fb.com>
parents:
27161
diff
changeset
|
735 $ hg backout ".^" --no-commit |
18943
27e8dfc2c338
subrepo: fix exception on revert when "all" option is omitted
Yuya Nishihara <yuya@tcha.org>
parents:
18941
diff
changeset
|
736 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
20276
6545770bd379
backout: add a message after backout that need manual commit
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20275
diff
changeset
|
737 changeset c373c8102e68 backed out, don't forget to commit. |
18943
27e8dfc2c338
subrepo: fix exception on revert when "all" option is omitted
Yuya Nishihara <yuya@tcha.org>
parents:
18941
diff
changeset
|
738 |
27e8dfc2c338
subrepo: fix exception on revert when "all" option is omitted
Yuya Nishihara <yuya@tcha.org>
parents:
18941
diff
changeset
|
739 $ hg up -C # discard changes |
27e8dfc2c338
subrepo: fix exception on revert when "all" option is omitted
Yuya Nishihara <yuya@tcha.org>
parents:
18941
diff
changeset
|
740 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
32698
1b5c61d38a52
update: show the commit to which we updated in case of multiple heads (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32678
diff
changeset
|
741 updated to "925c17564ef8: 13" |
28029
72072cfc7e91
update: warn about other topological heads on bare update
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27890
diff
changeset
|
742 2 other heads for branch "default" |
18943
27e8dfc2c338
subrepo: fix exception on revert when "all" option is omitted
Yuya Nishihara <yuya@tcha.org>
parents:
18941
diff
changeset
|
743 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
744 pull |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
745 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
746 $ cd ../tc |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
747 $ hg pull |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
748 pulling from $TESTTMP/t |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
749 searching for changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
750 adding changesets |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
751 adding manifests |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
752 adding file changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
753 added 1 changesets with 1 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33660
diff
changeset
|
754 new changesets 925c17564ef8 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
755 (run 'hg update' to get a working copy) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
756 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
757 should pull t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
758 |
24876
b5513ee85dd8
subrepo: don't pass the outer repo's --rev or --branch to subrepo incoming()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24875
diff
changeset
|
759 $ hg incoming -S -r `hg log -r tip -T "{node|short}"` |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
760 comparing with $TESTTMP/t |
24876
b5513ee85dd8
subrepo: don't pass the outer repo's --rev or --branch to subrepo incoming()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24875
diff
changeset
|
761 no changes found |
b5513ee85dd8
subrepo: don't pass the outer repo's --rev or --branch to subrepo incoming()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24875
diff
changeset
|
762 comparing with $TESTTMP/t/s |
b5513ee85dd8
subrepo: don't pass the outer repo's --rev or --branch to subrepo incoming()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24875
diff
changeset
|
763 searching for changes |
b5513ee85dd8
subrepo: don't pass the outer repo's --rev or --branch to subrepo incoming()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24875
diff
changeset
|
764 no changes found |
b5513ee85dd8
subrepo: don't pass the outer repo's --rev or --branch to subrepo incoming()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24875
diff
changeset
|
765 comparing with $TESTTMP/t/s/ss |
b5513ee85dd8
subrepo: don't pass the outer repo's --rev or --branch to subrepo incoming()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24875
diff
changeset
|
766 searching for changes |
b5513ee85dd8
subrepo: don't pass the outer repo's --rev or --branch to subrepo incoming()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24875
diff
changeset
|
767 no changes found |
b5513ee85dd8
subrepo: don't pass the outer repo's --rev or --branch to subrepo incoming()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24875
diff
changeset
|
768 comparing with $TESTTMP/t/t |
b5513ee85dd8
subrepo: don't pass the outer repo's --rev or --branch to subrepo incoming()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24875
diff
changeset
|
769 searching for changes |
b5513ee85dd8
subrepo: don't pass the outer repo's --rev or --branch to subrepo incoming()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24875
diff
changeset
|
770 changeset: 5:52c0adc0515a |
b5513ee85dd8
subrepo: don't pass the outer repo's --rev or --branch to subrepo incoming()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24875
diff
changeset
|
771 tag: tip |
b5513ee85dd8
subrepo: don't pass the outer repo's --rev or --branch to subrepo incoming()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24875
diff
changeset
|
772 user: test |
b5513ee85dd8
subrepo: don't pass the outer repo's --rev or --branch to subrepo incoming()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24875
diff
changeset
|
773 date: Thu Jan 01 00:00:00 1970 +0000 |
b5513ee85dd8
subrepo: don't pass the outer repo's --rev or --branch to subrepo incoming()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24875
diff
changeset
|
774 summary: 13 |
b5513ee85dd8
subrepo: don't pass the outer repo's --rev or --branch to subrepo incoming()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24875
diff
changeset
|
775 |
b5513ee85dd8
subrepo: don't pass the outer repo's --rev or --branch to subrepo incoming()
Matt Harbison <matt_harbison@yahoo.com>
parents:
24875
diff
changeset
|
776 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
777 $ hg up |
18720
0ade08dcb3c3
tests: remove glob lines which unnecessary match / for \ on windows
Simon Heimberg <simohe@besonet.ch>
parents:
18631
diff
changeset
|
778 pulling subrepo t from $TESTTMP/t/t |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
779 searching for changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
780 adding changesets |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
781 adding manifests |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
782 adding file changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
783 added 1 changesets with 1 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33660
diff
changeset
|
784 new changesets 52c0adc0515a |
18941
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
785 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
32698
1b5c61d38a52
update: show the commit to which we updated in case of multiple heads (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32678
diff
changeset
|
786 updated to "925c17564ef8: 13" |
28029
72072cfc7e91
update: warn about other topological heads on bare update
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27890
diff
changeset
|
787 2 other heads for branch "default" |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
788 $ cat t/t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
789 blah |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
790 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
791 bogus subrepo path aborts |
10251
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8816
diff
changeset
|
792 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
793 $ echo 'bogus=[boguspath' >> .hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
794 $ hg ci -m 'bogus subrepo path' |
33365
6d88468d435b
subrepo: make the output references to subrepositories consistent
Matt Harbison <matt_harbison@yahoo.com>
parents:
32698
diff
changeset
|
795 abort: missing ] in subrepository source |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
796 [255] |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
797 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12376
diff
changeset
|
798 Issue1986: merge aborts when trying to merge a subrepo that |
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12376
diff
changeset
|
799 shouldn't need merging |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
800 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
801 # subrepo layout |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
802 # |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
803 # o 5 br |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
804 # /| |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
805 # o | 4 default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
806 # | | |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
807 # | o 3 br |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
808 # |/| |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
809 # o | 2 default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
810 # | | |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
811 # | o 1 br |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
812 # |/ |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
813 # o 0 default |
10251
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8816
diff
changeset
|
814 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
815 $ cd .. |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
816 $ rm -rf sub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
817 $ hg init main |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
818 $ cd main |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
819 $ hg init s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
820 $ cd s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
821 $ echo a > a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
822 $ hg ci -Am1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
823 adding a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
824 $ hg branch br |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
825 marked working directory as branch br |
15615 | 826 (branches are permanent and global, did you want a bookmark?) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
827 $ echo a >> a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
828 $ hg ci -m1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
829 $ hg up default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
830 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
831 $ echo b > b |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
832 $ hg ci -Am1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
833 adding b |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
834 $ hg up br |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
835 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
836 $ hg merge tip |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
837 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
838 (branch merge, don't forget to commit) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
839 $ hg ci -m1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
840 $ hg up 2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
841 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
842 $ echo c > c |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
843 $ hg ci -Am1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
844 adding c |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
845 $ hg up 3 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
846 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
847 $ hg merge 4 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
848 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
849 (branch merge, don't forget to commit) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
850 $ hg ci -m1 |
10251
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8816
diff
changeset
|
851 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
852 # main repo layout: |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
853 # |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
854 # * <-- try to merge default into br again |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
855 # .`| |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
856 # . o 5 br --> substate = 5 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
857 # . | |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
858 # o | 4 default --> substate = 4 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
859 # | | |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
860 # | o 3 br --> substate = 2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
861 # |/| |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
862 # o | 2 default --> substate = 2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
863 # | | |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
864 # | o 1 br --> substate = 3 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
865 # |/ |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
866 # o 0 default --> substate = 2 |
10378
e1401c74572f
subrepo: change default path in hgrc of subrepo after cloning
Saint Germain <saintger@gmail.com>
parents:
10252
diff
changeset
|
867 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
868 $ cd .. |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
869 $ echo 's = s' > .hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
870 $ hg -R s up 2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
871 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
872 $ hg ci -Am1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
873 adding .hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
874 $ hg branch br |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
875 marked working directory as branch br |
15615 | 876 (branches are permanent and global, did you want a bookmark?) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
877 $ echo b > b |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
878 $ hg -R s up 3 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
879 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
880 $ hg ci -Am1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
881 adding b |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
882 $ hg up default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
883 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
884 $ echo c > c |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
885 $ hg ci -Am1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
886 adding c |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
887 $ hg up 1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
888 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
889 $ hg merge 2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
890 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
891 (branch merge, don't forget to commit) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
892 $ hg ci -m1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
893 $ hg up 2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
894 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
895 $ hg -R s up 4 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
896 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
897 $ echo d > d |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
898 $ hg ci -Am1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
899 adding d |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
900 $ hg up 3 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
901 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
902 $ hg -R s up 5 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
903 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
904 $ echo e > e |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
905 $ hg ci -Am1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
906 adding e |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
907 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
908 $ hg up 5 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
909 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
910 $ hg merge 4 # try to merge default into br again |
19811
5e10d41e7b9c
merge: let the user choose to merge, keep local or keep remote subrepo revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
19225
diff
changeset
|
911 subrepository s diverged (local revision: f8f13b33206e, remote revision: a3f9062a4f88) |
42588
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
912 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev]. |
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
913 what do you want to do? m |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
914 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
915 (branch merge, don't forget to commit) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
916 $ cd .. |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
917 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
918 test subrepo delete from .hgsubstate |
10522
b07d487009b2
subrepo: Update .hgsubstate in case of deleted subrepo
Saint Germain <saintger@gmail.com>
parents:
10468
diff
changeset
|
919 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
920 $ hg init testdelete |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
921 $ mkdir testdelete/nested testdelete/nested2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
922 $ hg init testdelete/nested |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
923 $ hg init testdelete/nested2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
924 $ echo test > testdelete/nested/foo |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
925 $ echo test > testdelete/nested2/foo |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
926 $ hg -R testdelete/nested add |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
927 adding testdelete/nested/foo |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
928 $ hg -R testdelete/nested2 add |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
929 adding testdelete/nested2/foo |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
930 $ hg -R testdelete/nested ci -m test |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
931 $ hg -R testdelete/nested2 ci -m test |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
932 $ echo nested = nested > testdelete/.hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
933 $ echo nested2 = nested2 >> testdelete/.hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
934 $ hg -R testdelete add |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
935 adding testdelete/.hgsub |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
936 $ hg -R testdelete ci -m "nested 1 & 2 added" |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
937 $ echo nested = nested > testdelete/.hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
938 $ hg -R testdelete ci -m "nested 2 deleted" |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
939 $ cat testdelete/.hgsubstate |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
940 bdf5c9a3103743d900b12ae0db3ffdcfd7b0d878 nested |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
941 $ hg -R testdelete remove testdelete/.hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
942 $ hg -R testdelete ci -m ".hgsub deleted" |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
943 $ cat testdelete/.hgsubstate |
14536
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
944 bdf5c9a3103743d900b12ae0db3ffdcfd7b0d878 nested |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
945 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
946 test repository cloning |
10251
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8816
diff
changeset
|
947 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
948 $ mkdir mercurial mercurial2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
949 $ hg init nested_absolute |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
950 $ echo test > nested_absolute/foo |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
951 $ hg -R nested_absolute add |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
952 adding nested_absolute/foo |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
953 $ hg -R nested_absolute ci -mtest |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
954 $ cd mercurial |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
955 $ hg init nested_relative |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
956 $ echo test2 > nested_relative/foo2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
957 $ hg -R nested_relative add |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
958 adding nested_relative/foo2 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
959 $ hg -R nested_relative ci -mtest2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
960 $ hg init main |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
961 $ echo "nested_relative = ../nested_relative" > main/.hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
962 $ echo "nested_absolute = `pwd`/nested_absolute" >> main/.hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
963 $ hg -R main add |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
964 adding main/.hgsub |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
965 $ hg -R main ci -m "add subrepos" |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
966 $ cd .. |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
967 $ hg clone mercurial/main mercurial2/main |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
968 updating to branch default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
969 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
970 $ cat mercurial2/main/nested_absolute/.hg/hgrc \ |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
971 > mercurial2/main/nested_relative/.hg/hgrc |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
972 [paths] |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16540
diff
changeset
|
973 default = $TESTTMP/mercurial/nested_absolute |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
974 [paths] |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16540
diff
changeset
|
975 default = $TESTTMP/mercurial/nested_relative |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
976 $ rm -rf mercurial mercurial2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
977 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12376
diff
changeset
|
978 Issue1977: multirepo push should fail if subrepo push fails |
11069
12f04d18143e
subrepo: add test for issue1977
Wagner Bruna <wbruna@softwareexpress.com.br>
parents:
10775
diff
changeset
|
979 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
980 $ hg init repo |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
981 $ hg init repo/s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
982 $ echo a > repo/s/a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
983 $ hg -R repo/s ci -Am0 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
984 adding a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
985 $ echo s = s > repo/.hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
986 $ hg -R repo ci -Am1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
987 adding .hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
988 $ hg clone repo repo2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
989 updating to branch default |
18720
0ade08dcb3c3
tests: remove glob lines which unnecessary match / for \ on windows
Simon Heimberg <simohe@besonet.ch>
parents:
18631
diff
changeset
|
990 cloning subrepo s from $TESTTMP/repo/s |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
991 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
992 $ hg -q -R repo2 pull -u |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
993 $ echo 1 > repo2/s/a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
994 $ hg -R repo2/s ci -m2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
995 $ hg -q -R repo2/s push |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
996 $ hg -R repo2/s up -C 0 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
997 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17895
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
998 $ echo 2 > repo2/s/b |
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
999 $ hg -R repo2/s ci -m3 -A |
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
1000 adding b |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
1001 created new head |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
1002 $ hg -R repo2 ci -m3 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
1003 $ hg -q -R repo2 push |
33365
6d88468d435b
subrepo: make the output references to subrepositories consistent
Matt Harbison <matt_harbison@yahoo.com>
parents:
32698
diff
changeset
|
1004 abort: push creates new remote head cc505f09a8b2! (in subrepository "s") |
29973
4ddb05751b12
discovery: use single quotes in use warning
timeless <timeless@mozdev.org>
parents:
29688
diff
changeset
|
1005 (merge or see 'hg help push' for details about pushing new heads) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
1006 [255] |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
1007 $ hg -R repo update |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
1008 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17895
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
1009 |
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
1010 test if untracked file is not overwritten |
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
1011 |
25753
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25418
diff
changeset
|
1012 (this also tests that updated .hgsubstate is treated as "modified", |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25418
diff
changeset
|
1013 when 'merge.update()' is aborted before 'merge.recordupdates()', even |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25418
diff
changeset
|
1014 if none of mode, size and timestamp of it isn't changed on the |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25418
diff
changeset
|
1015 filesystem (see also issue4583)) |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25418
diff
changeset
|
1016 |
17895
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
1017 $ echo issue3276_ok > repo/s/b |
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
1018 $ hg -R repo2 push -f -q |
23971
6becb9dbca25
merge: mark .hgsubstate as possibly dirty before submerge for consistency
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23348
diff
changeset
|
1019 $ touch -t 200001010000 repo/.hgsubstate |
25753
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25418
diff
changeset
|
1020 |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25418
diff
changeset
|
1021 $ cat >> repo/.hg/hgrc <<EOF |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25418
diff
changeset
|
1022 > [fakedirstatewritetime] |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25418
diff
changeset
|
1023 > # emulate invoking dirstate.write() via repo.status() |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25418
diff
changeset
|
1024 > # at 2000-01-01 00:00 |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25418
diff
changeset
|
1025 > fakenow = 200001010000 |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25418
diff
changeset
|
1026 > |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25418
diff
changeset
|
1027 > [extensions] |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25418
diff
changeset
|
1028 > fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25418
diff
changeset
|
1029 > EOF |
17895
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
1030 $ hg -R repo update |
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
1031 b: untracked file differs |
33365
6d88468d435b
subrepo: make the output references to subrepositories consistent
Matt Harbison <matt_harbison@yahoo.com>
parents:
32698
diff
changeset
|
1032 abort: untracked files in working directory differ from files in requested revision (in subrepository "s") |
17895
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
1033 [255] |
25753
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25418
diff
changeset
|
1034 $ cat >> repo/.hg/hgrc <<EOF |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25418
diff
changeset
|
1035 > [extensions] |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25418
diff
changeset
|
1036 > fakedirstatewritetime = ! |
fe03f522dda9
context: write dirstate out explicitly after marking files as clean
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
25418
diff
changeset
|
1037 > EOF |
17895
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
1038 |
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
1039 $ cat repo/s/b |
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
1040 issue3276_ok |
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
1041 $ rm repo/s/b |
23971
6becb9dbca25
merge: mark .hgsubstate as possibly dirty before submerge for consistency
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
23348
diff
changeset
|
1042 $ touch -t 200001010000 repo/.hgsubstate |
17895
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
1043 $ hg -R repo revert --all |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
1044 reverting repo/.hgsubstate |
17895
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
1045 reverting subrepo s |
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
1046 $ hg -R repo update |
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
1047 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
1048 $ cat repo/s/b |
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
1049 2 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
1050 $ rm -rf repo2 repo |
12753
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1051 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1052 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1053 Issue1852 subrepos with relative paths always push/pull relative to default |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1054 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1055 Prepare a repo with subrepo |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1056 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1057 $ hg init issue1852a |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1058 $ cd issue1852a |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1059 $ hg init sub/repo |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1060 $ echo test > sub/repo/foo |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1061 $ hg -R sub/repo add sub/repo/foo |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1062 $ echo sub/repo = sub/repo > .hgsub |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1063 $ hg add .hgsub |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1064 $ hg ci -mtest |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
1065 committing subrepository sub/repo |
12753
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1066 $ echo test >> sub/repo/foo |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1067 $ hg ci -mtest |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
1068 committing subrepository sub/repo |
21041
a2cc3c08c3ac
cat: support cat with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
21024
diff
changeset
|
1069 $ hg cat sub/repo/foo |
a2cc3c08c3ac
cat: support cat with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
21024
diff
changeset
|
1070 test |
a2cc3c08c3ac
cat: support cat with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
21024
diff
changeset
|
1071 test |
32678
bcb6684d144b
tests: adjust recent output changes for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
32584
diff
changeset
|
1072 $ hg cat sub/repo/foo -Tjson | sed 's|\\\\|/|g' |
32584
746e12a767b3
cat: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
31772
diff
changeset
|
1073 [ |
746e12a767b3
cat: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
31772
diff
changeset
|
1074 { |
746e12a767b3
cat: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
31772
diff
changeset
|
1075 "data": "test\ntest\n", |
39369
34ba47117164
formatter: rename {abspath}/{file} to {path}, and drop relative {path} (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
38425
diff
changeset
|
1076 "path": "foo" |
32584
746e12a767b3
cat: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
31772
diff
changeset
|
1077 } |
746e12a767b3
cat: add formatter support
Yuya Nishihara <yuya@tcha.org>
parents:
31772
diff
changeset
|
1078 ] |
35165
27196b7fc1ac
cat: record the current behavior of wildcard matches in subrepos
Yuya Nishihara <yuya@tcha.org>
parents:
34989
diff
changeset
|
1079 |
27196b7fc1ac
cat: record the current behavior of wildcard matches in subrepos
Yuya Nishihara <yuya@tcha.org>
parents:
34989
diff
changeset
|
1080 non-exact match: |
27196b7fc1ac
cat: record the current behavior of wildcard matches in subrepos
Yuya Nishihara <yuya@tcha.org>
parents:
34989
diff
changeset
|
1081 |
39369
34ba47117164
formatter: rename {abspath}/{file} to {path}, and drop relative {path} (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
38425
diff
changeset
|
1082 $ hg cat -T '{path|relpath}\n' 'glob:**' |
35165
27196b7fc1ac
cat: record the current behavior of wildcard matches in subrepos
Yuya Nishihara <yuya@tcha.org>
parents:
34989
diff
changeset
|
1083 .hgsub |
27196b7fc1ac
cat: record the current behavior of wildcard matches in subrepos
Yuya Nishihara <yuya@tcha.org>
parents:
34989
diff
changeset
|
1084 .hgsubstate |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
1085 sub/repo/foo |
39369
34ba47117164
formatter: rename {abspath}/{file} to {path}, and drop relative {path} (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
38425
diff
changeset
|
1086 $ hg cat -T '{path|relpath}\n' 're:^sub' |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
1087 sub/repo/foo |
35165
27196b7fc1ac
cat: record the current behavior of wildcard matches in subrepos
Yuya Nishihara <yuya@tcha.org>
parents:
34989
diff
changeset
|
1088 |
27196b7fc1ac
cat: record the current behavior of wildcard matches in subrepos
Yuya Nishihara <yuya@tcha.org>
parents:
34989
diff
changeset
|
1089 missing subrepos in working directory: |
27196b7fc1ac
cat: record the current behavior of wildcard matches in subrepos
Yuya Nishihara <yuya@tcha.org>
parents:
34989
diff
changeset
|
1090 |
21041
a2cc3c08c3ac
cat: support cat with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
21024
diff
changeset
|
1091 $ mkdir -p tmp/sub/repo |
a2cc3c08c3ac
cat: support cat with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
21024
diff
changeset
|
1092 $ hg cat -r 0 --output tmp/%p_p sub/repo/foo |
a2cc3c08c3ac
cat: support cat with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
21024
diff
changeset
|
1093 $ cat tmp/sub/repo/foo_p |
a2cc3c08c3ac
cat: support cat with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
21024
diff
changeset
|
1094 test |
a2cc3c08c3ac
cat: support cat with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
21024
diff
changeset
|
1095 $ mv sub/repo sub_ |
a2cc3c08c3ac
cat: support cat with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
21024
diff
changeset
|
1096 $ hg cat sub/repo/baz |
a2cc3c08c3ac
cat: support cat with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
21024
diff
changeset
|
1097 skipping missing subrepository: sub/repo |
a2cc3c08c3ac
cat: support cat with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
21024
diff
changeset
|
1098 [1] |
a2cc3c08c3ac
cat: support cat with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
21024
diff
changeset
|
1099 $ rm -rf sub/repo |
a2cc3c08c3ac
cat: support cat with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
21024
diff
changeset
|
1100 $ mv sub_ sub/repo |
12753
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1101 $ cd .. |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1102 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1103 Create repo without default path, pull top repo, and see what happens on update |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1104 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1105 $ hg init issue1852b |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1106 $ hg -R issue1852b pull issue1852a |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1107 pulling from issue1852a |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1108 requesting all changes |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1109 adding changesets |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1110 adding manifests |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1111 adding file changes |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1112 added 2 changesets with 3 changes to 2 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33660
diff
changeset
|
1113 new changesets 19487b456929:be5eb94e7215 |
12753
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1114 (run 'hg update' to get a working copy) |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1115 $ hg -R issue1852b update |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
1116 abort: default path for subrepository not found (in subrepository "sub/repo") |
12753
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1117 [255] |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1118 |
18965
0062508b1900
ui: add support for fully printing chained exception stacks in ui.traceback()
Matt Harbison <matt_harbison@yahoo.com>
parents:
18943
diff
changeset
|
1119 Ensure a full traceback, not just the SubrepoAbort part |
0062508b1900
ui: add support for fully printing chained exception stacks in ui.traceback()
Matt Harbison <matt_harbison@yahoo.com>
parents:
18943
diff
changeset
|
1120 |
26587
56b2bcea2529
error: get Abort from 'error' instead of 'util'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26517
diff
changeset
|
1121 $ hg -R issue1852b update --traceback 2>&1 | grep 'raise error\.Abort' |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
42605
diff
changeset
|
1122 raise error.Abort(_(b"default path for subrepository not found")) |
18965
0062508b1900
ui: add support for fully printing chained exception stacks in ui.traceback()
Matt Harbison <matt_harbison@yahoo.com>
parents:
18943
diff
changeset
|
1123 |
12753
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1124 Pull -u now doesn't help |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1125 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1126 $ hg -R issue1852b pull -u issue1852a |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1127 pulling from issue1852a |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1128 searching for changes |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1129 no changes found |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1130 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1131 Try the same, but with pull -u |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1132 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1133 $ hg init issue1852c |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1134 $ hg -R issue1852c pull -r0 -u issue1852a |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1135 pulling from issue1852a |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1136 adding changesets |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1137 adding manifests |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1138 adding file changes |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1139 added 1 changesets with 2 changes to 2 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33660
diff
changeset
|
1140 new changesets 19487b456929 |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
1141 cloning subrepo sub/repo from issue1852a/sub/repo |
12852
5dbff89cf107
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
1142 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12753
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1143 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1144 Try to push from the other side |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
1145 |
12852
5dbff89cf107
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
1146 $ hg -R issue1852a push `pwd`/issue1852c |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
1147 pushing to $TESTTMP/issue1852c |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
1148 pushing subrepo sub/repo to $TESTTMP/issue1852c/sub/repo |
12852
5dbff89cf107
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
1149 searching for changes |
5dbff89cf107
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
1150 no changes found |
5dbff89cf107
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
1151 searching for changes |
5dbff89cf107
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
1152 adding changesets |
5dbff89cf107
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
1153 adding manifests |
5dbff89cf107
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
1154 adding file changes |
5dbff89cf107
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
1155 added 1 changesets with 1 changes to 1 files |
13233
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
1156 |
14360
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
1157 Incoming and outgoing should not use the default path: |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
1158 |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
1159 $ hg clone -q issue1852a issue1852d |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
1160 $ hg -R issue1852d outgoing --subrepos issue1852c |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
1161 comparing with issue1852c |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
1162 searching for changes |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
1163 no changes found |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
1164 comparing with issue1852c/sub/repo |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
1165 searching for changes |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
1166 no changes found |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
1167 [1] |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
1168 $ hg -R issue1852d incoming --subrepos issue1852c |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
1169 comparing with issue1852c |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
1170 searching for changes |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
1171 no changes found |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
1172 comparing with issue1852c/sub/repo |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
1173 searching for changes |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
1174 no changes found |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
1175 [1] |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
1176 |
24858
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1177 Check that merge of a new subrepo doesn't write the uncommitted state to |
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1178 .hgsubstate (issue4622) |
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1179 |
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1180 $ hg init issue1852a/addedsub |
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1181 $ echo zzz > issue1852a/addedsub/zz.txt |
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1182 $ hg -R issue1852a/addedsub ci -Aqm "initial ZZ" |
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1183 |
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1184 $ hg clone issue1852a/addedsub issue1852d/addedsub |
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1185 updating to branch default |
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1186 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1187 |
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1188 $ echo def > issue1852a/sub/repo/foo |
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1189 $ hg -R issue1852a ci -SAm 'tweaked subrepo' |
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1190 adding tmp/sub/repo/foo_p |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
1191 committing subrepository sub/repo |
24858
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1192 |
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1193 $ echo 'addedsub = addedsub' >> issue1852d/.hgsub |
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1194 $ echo xyz > issue1852d/sub/repo/foo |
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1195 $ hg -R issue1852d pull -u |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
1196 pulling from $TESTTMP/issue1852a |
24858
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1197 searching for changes |
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1198 adding changesets |
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1199 adding manifests |
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1200 adding file changes |
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1201 added 1 changesets with 2 changes to 2 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33660
diff
changeset
|
1202 new changesets c82b79fdcc5b |
24858
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1203 subrepository sub/repo diverged (local revision: f42d5c7504a8, remote revision: 46cd4aac504c) |
42588
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1204 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination]. |
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1205 what do you want to do? m |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
1206 pulling subrepo sub/repo from $TESTTMP/issue1852a/sub/repo |
24858
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1207 searching for changes |
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1208 adding changesets |
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1209 adding manifests |
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1210 adding file changes |
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1211 added 1 changesets with 1 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33660
diff
changeset
|
1212 new changesets 46cd4aac504c |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
1213 subrepository sources for sub/repo differ |
42588
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1214 you can use (l)ocal source (f42d5c7504a8) or (r)emote source (46cd4aac504c). |
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1215 what do you want to do? l |
24858
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1216 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1217 $ cat issue1852d/.hgsubstate |
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1218 f42d5c7504a811dda50f5cf3e5e16c3330b87172 sub/repo |
a99931201d1b
subrepo: don't write .hgsubstate lines with empty subrepo state (issue4622)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24471
diff
changeset
|
1219 |
13233
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
1220 Check status of files when none of them belong to the first |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
1221 subrepository: |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
1222 |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
1223 $ hg init subrepo-status |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
1224 $ cd subrepo-status |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
1225 $ hg init subrepo-1 |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
1226 $ hg init subrepo-2 |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
1227 $ cd subrepo-2 |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
1228 $ touch file |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
1229 $ hg add file |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
1230 $ cd .. |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
1231 $ echo subrepo-1 = subrepo-1 > .hgsub |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
1232 $ echo subrepo-2 = subrepo-2 >> .hgsub |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
1233 $ hg add .hgsub |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
1234 $ hg ci -m 'Added subrepos' |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
1235 committing subrepository subrepo-2 |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
1236 $ hg st subrepo-2/file |
13322
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
1237 |
17938
fd903f89e42b
share: always set default path to work with subrepos (issue3518)
simon@laptop-tosh
parents:
17907
diff
changeset
|
1238 Check that share works with subrepo |
fd903f89e42b
share: always set default path to work with subrepos (issue3518)
simon@laptop-tosh
parents:
17907
diff
changeset
|
1239 $ hg --config extensions.share= share . ../shared |
fd903f89e42b
share: always set default path to work with subrepos (issue3518)
simon@laptop-tosh
parents:
17907
diff
changeset
|
1240 updating working directory |
34815
68e0bcb90357
subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1241 sharing subrepo subrepo-1 from $TESTTMP/subrepo-status/subrepo-1 |
68e0bcb90357
subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1242 sharing subrepo subrepo-2 from $TESTTMP/subrepo-status/subrepo-2 |
17938
fd903f89e42b
share: always set default path to work with subrepos (issue3518)
simon@laptop-tosh
parents:
17907
diff
changeset
|
1243 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
34815
68e0bcb90357
subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1244 $ find ../shared/* | sort |
68e0bcb90357
subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1245 ../shared/subrepo-1 |
68e0bcb90357
subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1246 ../shared/subrepo-1/.hg |
68e0bcb90357
subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1247 ../shared/subrepo-1/.hg/cache |
68e0bcb90357
subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1248 ../shared/subrepo-1/.hg/cache/storehash |
68e0bcb90357
subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1249 ../shared/subrepo-1/.hg/cache/storehash/* (glob) |
68e0bcb90357
subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1250 ../shared/subrepo-1/.hg/hgrc |
68e0bcb90357
subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1251 ../shared/subrepo-1/.hg/requires |
68e0bcb90357
subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1252 ../shared/subrepo-1/.hg/sharedpath |
40794
d5622dfe4ba3
cache: create `wcache` directory at init time
Boris Feld <boris.feld@octobus.net>
parents:
40792
diff
changeset
|
1253 ../shared/subrepo-1/.hg/wcache |
34815
68e0bcb90357
subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1254 ../shared/subrepo-2 |
68e0bcb90357
subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1255 ../shared/subrepo-2/.hg |
68e0bcb90357
subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1256 ../shared/subrepo-2/.hg/branch |
68e0bcb90357
subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1257 ../shared/subrepo-2/.hg/cache |
68e0bcb90357
subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1258 ../shared/subrepo-2/.hg/cache/storehash |
68e0bcb90357
subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1259 ../shared/subrepo-2/.hg/cache/storehash/* (glob) |
68e0bcb90357
subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1260 ../shared/subrepo-2/.hg/dirstate |
68e0bcb90357
subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1261 ../shared/subrepo-2/.hg/hgrc |
68e0bcb90357
subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1262 ../shared/subrepo-2/.hg/requires |
68e0bcb90357
subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1263 ../shared/subrepo-2/.hg/sharedpath |
40792
47e3f554df35
check-exec: write file in 'wcache' instead of 'cache'
Boris Feld <boris.feld@octobus.net>
parents:
40655
diff
changeset
|
1264 ../shared/subrepo-2/.hg/wcache |
40807
f6d37e84d8f9
tests: stabilize for recent wcache changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
40794
diff
changeset
|
1265 ../shared/subrepo-2/.hg/wcache/checkisexec (execbit !) |
f6d37e84d8f9
tests: stabilize for recent wcache changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
40794
diff
changeset
|
1266 ../shared/subrepo-2/.hg/wcache/checklink (symlink !) |
f6d37e84d8f9
tests: stabilize for recent wcache changes
Matt Harbison <matt_harbison@yahoo.com>
parents:
40794
diff
changeset
|
1267 ../shared/subrepo-2/.hg/wcache/checklink-target (symlink !) |
41965
e4ac7e63c213
manifestcache: use `wcache` directory for manifest cache
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
41748
diff
changeset
|
1268 ../shared/subrepo-2/.hg/wcache/manifestfulltextcache (reporevlogstore !) |
34815
68e0bcb90357
subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
1269 ../shared/subrepo-2/file |
18510
f254ab6207ae
subrepo: use sharepath if available when locating the source repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
18109
diff
changeset
|
1270 $ hg -R ../shared in |
18511
798ab869b2ee
share: backout fd903f89e42b, except the test
Matt Harbison <matt_harbison@yahoo.com>
parents:
18510
diff
changeset
|
1271 abort: repository default not found! |
798ab869b2ee
share: backout fd903f89e42b, except the test
Matt Harbison <matt_harbison@yahoo.com>
parents:
18510
diff
changeset
|
1272 [255] |
18510
f254ab6207ae
subrepo: use sharepath if available when locating the source repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
18109
diff
changeset
|
1273 $ hg -R ../shared/subrepo-2 showconfig paths |
f254ab6207ae
subrepo: use sharepath if available when locating the source repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
18109
diff
changeset
|
1274 paths.default=$TESTTMP/subrepo-status/subrepo-2 |
f254ab6207ae
subrepo: use sharepath if available when locating the source repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
18109
diff
changeset
|
1275 $ hg -R ../shared/subrepo-1 sum --remote |
f254ab6207ae
subrepo: use sharepath if available when locating the source repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
18109
diff
changeset
|
1276 parent: -1:000000000000 tip (empty repository) |
f254ab6207ae
subrepo: use sharepath if available when locating the source repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
18109
diff
changeset
|
1277 branch: default |
f254ab6207ae
subrepo: use sharepath if available when locating the source repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
18109
diff
changeset
|
1278 commit: (clean) |
f254ab6207ae
subrepo: use sharepath if available when locating the source repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
18109
diff
changeset
|
1279 update: (current) |
f254ab6207ae
subrepo: use sharepath if available when locating the source repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
18109
diff
changeset
|
1280 remote: (synced) |
17938
fd903f89e42b
share: always set default path to work with subrepos (issue3518)
simon@laptop-tosh
parents:
17907
diff
changeset
|
1281 |
13322
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
1282 Check hg update --clean |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16540
diff
changeset
|
1283 $ cd $TESTTMP/t |
13322
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
1284 $ rm -r t/t.orig |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
1285 $ hg status -S --all |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
1286 C .hgsub |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
1287 C .hgsubstate |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
1288 C a |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
1289 C s/.hgsub |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
1290 C s/.hgsubstate |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
1291 C s/a |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
1292 C s/ss/a |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
1293 C t/t |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
1294 $ echo c1 > s/a |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
1295 $ cd s |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
1296 $ echo c1 > b |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
1297 $ echo c1 > c |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
1298 $ hg add b |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
1299 $ cd .. |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
1300 $ hg status -S |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
1301 M s/a |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
1302 A s/b |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
1303 ? s/c |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
1304 $ hg update -C |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
1305 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
32698
1b5c61d38a52
update: show the commit to which we updated in case of multiple heads (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
32678
diff
changeset
|
1306 updated to "925c17564ef8: 13" |
28029
72072cfc7e91
update: warn about other topological heads on bare update
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
27890
diff
changeset
|
1307 2 other heads for branch "default" |
13322
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
1308 $ hg status -S |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
1309 ? s/b |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
1310 ? s/c |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1311 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1312 Sticky subrepositories, no changes |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16540
diff
changeset
|
1313 $ cd $TESTTMP/t |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1314 $ hg id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1315 925c17564ef8 tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1316 $ hg -R s id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1317 12a213df6fa9 tip |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17255
diff
changeset
|
1318 $ hg -R t id |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1319 52c0adc0515a tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1320 $ hg update 11 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1321 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1322 $ hg id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1323 365661e5936a |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1324 $ hg -R s id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1325 fc627a69481f |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17255
diff
changeset
|
1326 $ hg -R t id |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1327 e95bcfa18a35 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1328 |
21024
7731a2281cf0
spelling: fixes from spell checker
Mads Kiilerich <madski@unity3d.com>
parents:
20827
diff
changeset
|
1329 Sticky subrepositories, file changes |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1330 $ touch s/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1331 $ touch t/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1332 $ hg add -S s/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1333 $ hg add -S t/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1334 $ hg id |
17255
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
1335 365661e5936a+ |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1336 $ hg -R s id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1337 fc627a69481f+ |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17255
diff
changeset
|
1338 $ hg -R t id |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1339 e95bcfa18a35+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1340 $ hg update tip |
19811
5e10d41e7b9c
merge: let the user choose to merge, keep local or keep remote subrepo revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
19225
diff
changeset
|
1341 subrepository s diverged (local revision: fc627a69481f, remote revision: 12a213df6fa9) |
42588
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1342 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination]. |
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1343 what do you want to do? m |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1344 subrepository sources for s differ |
42588
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1345 you can use (l)ocal source (fc627a69481f) or (r)emote source (12a213df6fa9). |
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1346 what do you want to do? l |
19811
5e10d41e7b9c
merge: let the user choose to merge, keep local or keep remote subrepo revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
19225
diff
changeset
|
1347 subrepository t diverged (local revision: e95bcfa18a35, remote revision: 52c0adc0515a) |
42588
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1348 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination]. |
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1349 what do you want to do? m |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1350 subrepository sources for t differ |
42588
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1351 you can use (l)ocal source (e95bcfa18a35) or (r)emote source (52c0adc0515a). |
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1352 what do you want to do? l |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1353 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1354 $ hg id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1355 925c17564ef8+ tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1356 $ hg -R s id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1357 fc627a69481f+ |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17255
diff
changeset
|
1358 $ hg -R t id |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1359 e95bcfa18a35+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1360 $ hg update --clean tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1361 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1362 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1363 Sticky subrepository, revision updates |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1364 $ hg id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1365 925c17564ef8 tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1366 $ hg -R s id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1367 12a213df6fa9 tip |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17255
diff
changeset
|
1368 $ hg -R t id |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1369 52c0adc0515a tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1370 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1371 $ hg update -r -2 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1372 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1373 $ cd ../t |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1374 $ hg update -r 2 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1375 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1376 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1377 $ hg update 10 |
19811
5e10d41e7b9c
merge: let the user choose to merge, keep local or keep remote subrepo revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
19225
diff
changeset
|
1378 subrepository s diverged (local revision: 12a213df6fa9, remote revision: fc627a69481f) |
42588
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1379 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination]. |
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1380 what do you want to do? m |
19811
5e10d41e7b9c
merge: let the user choose to merge, keep local or keep remote subrepo revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
19225
diff
changeset
|
1381 subrepository t diverged (local revision: 52c0adc0515a, remote revision: 20a0db6fbf6c) |
42588
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1382 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination]. |
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1383 what do you want to do? m |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1384 subrepository sources for t differ (in checked out version) |
42588
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1385 you can use (l)ocal source (7af322bc1198) or (r)emote source (20a0db6fbf6c). |
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1386 what do you want to do? l |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1387 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1388 $ hg id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1389 e45c8b14af55+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1390 $ hg -R s id |
17255
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
1391 02dcf1d70411 |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17255
diff
changeset
|
1392 $ hg -R t id |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1393 7af322bc1198 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1394 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1395 Sticky subrepository, file changes and revision updates |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1396 $ touch s/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1397 $ touch t/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1398 $ hg add -S s/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1399 $ hg add -S t/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1400 $ hg id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1401 e45c8b14af55+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1402 $ hg -R s id |
17255
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
1403 02dcf1d70411+ |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17255
diff
changeset
|
1404 $ hg -R t id |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1405 7af322bc1198+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1406 $ hg update tip |
19811
5e10d41e7b9c
merge: let the user choose to merge, keep local or keep remote subrepo revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
19225
diff
changeset
|
1407 subrepository s diverged (local revision: 12a213df6fa9, remote revision: 12a213df6fa9) |
42588
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1408 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination]. |
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1409 what do you want to do? m |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1410 subrepository sources for s differ |
42588
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1411 you can use (l)ocal source (02dcf1d70411) or (r)emote source (12a213df6fa9). |
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1412 what do you want to do? l |
19811
5e10d41e7b9c
merge: let the user choose to merge, keep local or keep remote subrepo revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
19225
diff
changeset
|
1413 subrepository t diverged (local revision: 52c0adc0515a, remote revision: 52c0adc0515a) |
42588
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1414 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination]. |
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1415 what do you want to do? m |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1416 subrepository sources for t differ |
42588
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1417 you can use (l)ocal source (7af322bc1198) or (r)emote source (52c0adc0515a). |
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1418 what do you want to do? l |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1419 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1420 $ hg id |
17255
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
1421 925c17564ef8+ tip |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1422 $ hg -R s id |
17255
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
1423 02dcf1d70411+ |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17255
diff
changeset
|
1424 $ hg -R t id |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1425 7af322bc1198+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1426 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1427 Sticky repository, update --clean |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1428 $ hg update --clean tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1429 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1430 $ hg id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1431 925c17564ef8 tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1432 $ hg -R s id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1433 12a213df6fa9 tip |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17255
diff
changeset
|
1434 $ hg -R t id |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1435 52c0adc0515a tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1436 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1437 Test subrepo already at intended revision: |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1438 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1439 $ hg update fc627a69481f |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1440 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1441 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1442 $ hg update 11 |
19811
5e10d41e7b9c
merge: let the user choose to merge, keep local or keep remote subrepo revisions
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
19225
diff
changeset
|
1443 subrepository s diverged (local revision: 12a213df6fa9, remote revision: fc627a69481f) |
42588
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1444 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination]. |
f6540aba8e3e
subrepos: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents:
42167
diff
changeset
|
1445 what do you want to do? m |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1446 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1447 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1448 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1449 11+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1450 $ hg -R s id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1451 fc627a69481f |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17255
diff
changeset
|
1452 $ hg -R t id |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1453 e95bcfa18a35 |
14536
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1454 |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1455 Test that removing .hgsubstate doesn't break anything: |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1456 |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1457 $ hg rm -f .hgsubstate |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1458 $ hg ci -mrm |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
16039
diff
changeset
|
1459 nothing changed |
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
16039
diff
changeset
|
1460 [1] |
14536
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1461 $ hg log -vr tip |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
16039
diff
changeset
|
1462 changeset: 13:925c17564ef8 |
14536
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1463 tag: tip |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1464 user: test |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1465 date: Thu Jan 01 00:00:00 1970 +0000 |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
16039
diff
changeset
|
1466 files: .hgsubstate |
14536
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1467 description: |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
16039
diff
changeset
|
1468 13 |
14536
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1469 |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1470 |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1471 |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1472 Test that removing .hgsub removes .hgsubstate: |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1473 |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1474 $ hg rm .hgsub |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1475 $ hg ci -mrm2 |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
16039
diff
changeset
|
1476 created new head |
14536
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1477 $ hg log -vr tip |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
16039
diff
changeset
|
1478 changeset: 14:2400bccd50af |
14536
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1479 tag: tip |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
16039
diff
changeset
|
1480 parent: 11:365661e5936a |
14536
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1481 user: test |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1482 date: Thu Jan 01 00:00:00 1970 +0000 |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1483 files: .hgsub .hgsubstate |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1484 description: |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1485 rm2 |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1486 |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1487 |
15635
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
1488 Test issue3153: diff -S with deleted subrepos |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
1489 |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
1490 $ hg diff --nodates -S -c . |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
16039
diff
changeset
|
1491 diff -r 365661e5936a -r 2400bccd50af .hgsub |
15635
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
1492 --- a/.hgsub |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
1493 +++ /dev/null |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
1494 @@ -1,2 +0,0 @@ |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
1495 -s = s |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
1496 -t = t |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
16039
diff
changeset
|
1497 diff -r 365661e5936a -r 2400bccd50af .hgsubstate |
15635
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
1498 --- a/.hgsubstate |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
1499 +++ /dev/null |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
1500 @@ -1,2 +0,0 @@ |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
1501 -fc627a69481fcbe5f1135069e8a3881c023e4cf5 s |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
1502 -e95bcfa18a358dc4936da981ebf4147b4cad1362 t |
15636 | 1503 |
15409
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1504 Test behavior of add for explicit path in subrepo: |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1505 $ cd .. |
15473
d90b0b30464b
tests: add test for behavior of forget for explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15447
diff
changeset
|
1506 $ hg init explicit |
d90b0b30464b
tests: add test for behavior of forget for explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15447
diff
changeset
|
1507 $ cd explicit |
15409
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1508 $ echo s = s > .hgsub |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1509 $ hg add .hgsub |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1510 $ hg init s |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1511 $ hg ci -m0 |
15410
9e99d2bbb1b1
add: support adding explicit files in subrepos
David M. Carr <david@carrclan.us>
parents:
15409
diff
changeset
|
1512 Adding with an explicit path in a subrepo adds the file |
15409
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1513 $ echo c1 > f1 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1514 $ echo c2 > s/f2 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1515 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1516 ? f1 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1517 ? s/f2 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1518 $ hg add s/f2 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1519 $ hg st -S |
15410
9e99d2bbb1b1
add: support adding explicit files in subrepos
David M. Carr <david@carrclan.us>
parents:
15409
diff
changeset
|
1520 A s/f2 |
15409
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1521 ? f1 |
15410
9e99d2bbb1b1
add: support adding explicit files in subrepos
David M. Carr <david@carrclan.us>
parents:
15409
diff
changeset
|
1522 $ hg ci -R s -m0 |
15409
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1523 $ hg ci -Am1 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1524 adding f1 |
15410
9e99d2bbb1b1
add: support adding explicit files in subrepos
David M. Carr <david@carrclan.us>
parents:
15409
diff
changeset
|
1525 Adding with an explicit path in a subrepo with -S has the same behavior |
15409
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1526 $ echo c3 > f3 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1527 $ echo c4 > s/f4 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1528 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1529 ? f3 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1530 ? s/f4 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1531 $ hg add -S s/f4 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1532 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1533 A s/f4 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1534 ? f3 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1535 $ hg ci -R s -m1 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1536 $ hg ci -Ama2 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1537 adding f3 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1538 Adding without a path or pattern silently ignores subrepos |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1539 $ echo c5 > f5 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1540 $ echo c6 > s/f6 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1541 $ echo c7 > s/f7 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1542 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1543 ? f5 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1544 ? s/f6 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1545 ? s/f7 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1546 $ hg add |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1547 adding f5 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1548 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1549 A f5 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1550 ? s/f6 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1551 ? s/f7 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1552 $ hg ci -R s -Am2 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1553 adding f6 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1554 adding f7 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1555 $ hg ci -m3 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1556 Adding without a path or pattern with -S also adds files in subrepos |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1557 $ echo c8 > f8 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1558 $ echo c9 > s/f9 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1559 $ echo c10 > s/f10 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1560 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1561 ? f8 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1562 ? s/f10 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1563 ? s/f9 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1564 $ hg add -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1565 adding f8 |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
1566 adding s/f10 |
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
1567 adding s/f9 |
15409
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1568 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1569 A f8 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1570 A s/f10 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1571 A s/f9 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1572 $ hg ci -R s -m3 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1573 $ hg ci -m4 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1574 Adding with a pattern silently ignores subrepos |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1575 $ echo c11 > fm11 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1576 $ echo c12 > fn12 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1577 $ echo c13 > s/fm13 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1578 $ echo c14 > s/fn14 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1579 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1580 ? fm11 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1581 ? fn12 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1582 ? s/fm13 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1583 ? s/fn14 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1584 $ hg add 'glob:**fm*' |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1585 adding fm11 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1586 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1587 A fm11 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1588 ? fn12 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1589 ? s/fm13 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1590 ? s/fn14 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1591 $ hg ci -R s -Am4 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1592 adding fm13 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1593 adding fn14 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1594 $ hg ci -Am5 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1595 adding fn12 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1596 Adding with a pattern with -S also adds matches in subrepos |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1597 $ echo c15 > fm15 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1598 $ echo c16 > fn16 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1599 $ echo c17 > s/fm17 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1600 $ echo c18 > s/fn18 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1601 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1602 ? fm15 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1603 ? fn16 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1604 ? s/fm17 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1605 ? s/fn18 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1606 $ hg add -S 'glob:**fm*' |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1607 adding fm15 |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
1608 adding s/fm17 |
15409
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1609 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1610 A fm15 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1611 A s/fm17 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1612 ? fn16 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1613 ? s/fn18 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1614 $ hg ci -R s -Am5 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1615 adding fn18 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1616 $ hg ci -Am6 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1617 adding fn16 |
15473
d90b0b30464b
tests: add test for behavior of forget for explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15447
diff
changeset
|
1618 |
d90b0b30464b
tests: add test for behavior of forget for explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15447
diff
changeset
|
1619 Test behavior of forget for explicit path in subrepo: |
15474
95174c381525
forget: support forgetting explicit paths in subrepos
David M. Carr <david@carrclan.us>
parents:
15473
diff
changeset
|
1620 Forgetting an explicit path in a subrepo untracks the file |
15473
d90b0b30464b
tests: add test for behavior of forget for explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15447
diff
changeset
|
1621 $ echo c19 > s/f19 |
d90b0b30464b
tests: add test for behavior of forget for explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15447
diff
changeset
|
1622 $ hg add s/f19 |
d90b0b30464b
tests: add test for behavior of forget for explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15447
diff
changeset
|
1623 $ hg st -S |
d90b0b30464b
tests: add test for behavior of forget for explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15447
diff
changeset
|
1624 A s/f19 |
d90b0b30464b
tests: add test for behavior of forget for explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15447
diff
changeset
|
1625 $ hg forget s/f19 |
15474
95174c381525
forget: support forgetting explicit paths in subrepos
David M. Carr <david@carrclan.us>
parents:
15473
diff
changeset
|
1626 $ hg st -S |
95174c381525
forget: support forgetting explicit paths in subrepos
David M. Carr <david@carrclan.us>
parents:
15473
diff
changeset
|
1627 ? s/f19 |
15473
d90b0b30464b
tests: add test for behavior of forget for explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15447
diff
changeset
|
1628 $ rm s/f19 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16540
diff
changeset
|
1629 $ cd .. |
18520
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1630 |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1631 Courtesy phases synchronisation to publishing server does not block the push |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1632 (issue3781) |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1633 |
30556
c059286a0f9c
tests: replace "cp -r" with "cp -R"
Jun Wu <quark@fb.com>
parents:
30460
diff
changeset
|
1634 $ cp -R main issue3781 |
c059286a0f9c
tests: replace "cp -r" with "cp -R"
Jun Wu <quark@fb.com>
parents:
30460
diff
changeset
|
1635 $ cp -R main issue3781-dest |
18520
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1636 $ cd issue3781-dest/s |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1637 $ hg phase tip # show we have draft changeset |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1638 5: draft |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1639 $ chmod a-w .hg/store/phaseroots # prevent phase push |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1640 $ cd ../../issue3781 |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1641 $ cat >> .hg/hgrc << EOF |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1642 > [paths] |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1643 > default=../issue3781-dest/ |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1644 > EOF |
29687
ac9b85079122
tests: use 'legacy.exchange' option in various mixed tests
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29633
diff
changeset
|
1645 $ hg push --config devel.legacy.exchange=bundle1 |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
1646 pushing to $TESTTMP/issue3781-dest |
25337
636b1f1b9f8d
subrepo: detect issue3781 case earlier so it apply to bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25125
diff
changeset
|
1647 pushing subrepo s to $TESTTMP/issue3781-dest/s |
636b1f1b9f8d
subrepo: detect issue3781 case earlier so it apply to bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25125
diff
changeset
|
1648 searching for changes |
636b1f1b9f8d
subrepo: detect issue3781 case earlier so it apply to bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25125
diff
changeset
|
1649 no changes found |
636b1f1b9f8d
subrepo: detect issue3781 case earlier so it apply to bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25125
diff
changeset
|
1650 searching for changes |
636b1f1b9f8d
subrepo: detect issue3781 case earlier so it apply to bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25125
diff
changeset
|
1651 no changes found |
636b1f1b9f8d
subrepo: detect issue3781 case earlier so it apply to bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25125
diff
changeset
|
1652 [1] |
636b1f1b9f8d
subrepo: detect issue3781 case earlier so it apply to bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25125
diff
changeset
|
1653 # clean the push cache |
636b1f1b9f8d
subrepo: detect issue3781 case earlier so it apply to bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25125
diff
changeset
|
1654 $ rm s/.hg/cache/storehash/* |
29688
30c59bdd4f41
tests: remove all remaining usage of experimental.bundle2-exp
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
29687
diff
changeset
|
1655 $ hg push # bundle2+ |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
1656 pushing to $TESTTMP/issue3781-dest |
18520
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1657 pushing subrepo s to $TESTTMP/issue3781-dest/s |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1658 searching for changes |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1659 no changes found |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1660 searching for changes |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1661 no changes found |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1662 [1] |
20176
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1663 $ cd .. |
18520
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1664 |
20176
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1665 Test phase choice for newly created commit with "phases.subrepochecks" |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1666 configuration |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1667 |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1668 $ cd t |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1669 $ hg update -q -r 12 |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1670 |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1671 $ cat >> s/ss/.hg/hgrc <<EOF |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1672 > [phases] |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1673 > new-commit = secret |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1674 > EOF |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1675 $ cat >> s/.hg/hgrc <<EOF |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1676 > [phases] |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1677 > new-commit = draft |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1678 > EOF |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1679 $ echo phasecheck1 >> s/ss/a |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1680 $ hg -R s commit -S --config phases.checksubrepos=abort -m phasecheck1 |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1681 committing subrepository ss |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1682 transaction abort! |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1683 rollback completed |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1684 abort: can't commit in draft phase conflicting secret from subrepository ss |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1685 [255] |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1686 $ echo phasecheck2 >> s/ss/a |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1687 $ hg -R s commit -S --config phases.checksubrepos=ignore -m phasecheck2 |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1688 committing subrepository ss |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1689 $ hg -R s/ss phase tip |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1690 3: secret |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1691 $ hg -R s phase tip |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1692 6: draft |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1693 $ echo phasecheck3 >> s/ss/a |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1694 $ hg -R s commit -S -m phasecheck3 |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1695 committing subrepository ss |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1696 warning: changes are committed in secret phase from subrepository ss |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1697 $ hg -R s/ss phase tip |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1698 4: secret |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1699 $ hg -R s phase tip |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1700 7: secret |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1701 |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1702 $ cat >> t/.hg/hgrc <<EOF |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1703 > [phases] |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1704 > new-commit = draft |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1705 > EOF |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1706 $ cat >> .hg/hgrc <<EOF |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1707 > [phases] |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1708 > new-commit = public |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1709 > EOF |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1710 $ echo phasecheck4 >> s/ss/a |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1711 $ echo phasecheck4 >> t/t |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1712 $ hg commit -S -m phasecheck4 |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1713 committing subrepository s |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35165
diff
changeset
|
1714 committing subrepository s/ss |
20176
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1715 warning: changes are committed in secret phase from subrepository ss |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1716 committing subrepository t |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1717 warning: changes are committed in secret phase from subrepository s |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1718 created new head |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1719 $ hg -R s/ss phase tip |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1720 5: secret |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1721 $ hg -R s phase tip |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1722 8: secret |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1723 $ hg -R t phase tip |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1724 6: draft |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1725 $ hg phase tip |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1726 15: secret |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1727 |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1728 $ cd .. |
20772
03774a2b6991
commit: propagate --secret option to subrepos (issue4182)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20276
diff
changeset
|
1729 |
03774a2b6991
commit: propagate --secret option to subrepos (issue4182)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20276
diff
changeset
|
1730 |
21024
7731a2281cf0
spelling: fixes from spell checker
Mads Kiilerich <madski@unity3d.com>
parents:
20827
diff
changeset
|
1731 Test that commit --secret works on both repo and subrepo (issue4182) |
20772
03774a2b6991
commit: propagate --secret option to subrepos (issue4182)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20276
diff
changeset
|
1732 |
03774a2b6991
commit: propagate --secret option to subrepos (issue4182)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20276
diff
changeset
|
1733 $ cd main |
03774a2b6991
commit: propagate --secret option to subrepos (issue4182)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20276
diff
changeset
|
1734 $ echo secret >> b |
03774a2b6991
commit: propagate --secret option to subrepos (issue4182)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20276
diff
changeset
|
1735 $ echo secret >> s/b |
03774a2b6991
commit: propagate --secret option to subrepos (issue4182)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20276
diff
changeset
|
1736 $ hg commit --secret --subrepo -m "secret" |
03774a2b6991
commit: propagate --secret option to subrepos (issue4182)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20276
diff
changeset
|
1737 committing subrepository s |
03774a2b6991
commit: propagate --secret option to subrepos (issue4182)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20276
diff
changeset
|
1738 $ hg phase -r . |
03774a2b6991
commit: propagate --secret option to subrepos (issue4182)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20276
diff
changeset
|
1739 6: secret |
03774a2b6991
commit: propagate --secret option to subrepos (issue4182)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20276
diff
changeset
|
1740 $ cd s |
03774a2b6991
commit: propagate --secret option to subrepos (issue4182)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20276
diff
changeset
|
1741 $ hg phase -r . |
03774a2b6991
commit: propagate --secret option to subrepos (issue4182)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20276
diff
changeset
|
1742 6: secret |
03774a2b6991
commit: propagate --secret option to subrepos (issue4182)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20276
diff
changeset
|
1743 $ cd ../../ |
21890
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1744 |
21897
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1745 Test "subrepos" template keyword |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1746 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1747 $ cd t |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1748 $ hg update -q 15 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1749 $ cat > .hgsub <<EOF |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1750 > s = s |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1751 > EOF |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1752 $ hg commit -m "16" |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1753 warning: changes are committed in secret phase from subrepository s |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1754 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1755 (addition of ".hgsub" itself) |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1756 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1757 $ hg diff --nodates -c 1 .hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1758 diff -r f7b1eb17ad24 -r 7cf8cfea66e4 .hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1759 --- /dev/null |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1760 +++ b/.hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1761 @@ -0,0 +1,1 @@ |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1762 +e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1763 $ hg log -r 1 --template "{p1node|short} {p2node|short}\n{subrepos % '{subrepo}\n'}" |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1764 f7b1eb17ad24 000000000000 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1765 s |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1766 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1767 (modification of existing entry) |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1768 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1769 $ hg diff --nodates -c 2 .hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1770 diff -r 7cf8cfea66e4 -r df30734270ae .hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1771 --- a/.hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1772 +++ b/.hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1773 @@ -1,1 +1,1 @@ |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1774 -e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1775 +dc73e2e6d2675eb2e41e33c205f4bdab4ea5111d s |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1776 $ hg log -r 2 --template "{p1node|short} {p2node|short}\n{subrepos % '{subrepo}\n'}" |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1777 7cf8cfea66e4 000000000000 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1778 s |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1779 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1780 (addition of entry) |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1781 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1782 $ hg diff --nodates -c 5 .hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1783 diff -r 7cf8cfea66e4 -r 1f14a2e2d3ec .hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1784 --- a/.hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1785 +++ b/.hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1786 @@ -1,1 +1,2 @@ |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1787 e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1788 +60ca1237c19474e7a3978b0dc1ca4e6f36d51382 t |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1789 $ hg log -r 5 --template "{p1node|short} {p2node|short}\n{subrepos % '{subrepo}\n'}" |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1790 7cf8cfea66e4 000000000000 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1791 t |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1792 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1793 (removal of existing entry) |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1794 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1795 $ hg diff --nodates -c 16 .hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1796 diff -r 8bec38d2bd0b -r f2f70bc3d3c9 .hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1797 --- a/.hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1798 +++ b/.hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1799 @@ -1,2 +1,1 @@ |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1800 0731af8ca9423976d3743119d0865097c07bdc1b s |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1801 -e202dc79b04c88a636ea8913d9182a1346d9b3dc t |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1802 $ hg log -r 16 --template "{p1node|short} {p2node|short}\n{subrepos % '{subrepo}\n'}" |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1803 8bec38d2bd0b 000000000000 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1804 t |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1805 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1806 (merging) |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1807 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1808 $ hg diff --nodates -c 9 .hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1809 diff -r f6affe3fbfaa -r f0d2028bf86d .hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1810 --- a/.hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1811 +++ b/.hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1812 @@ -1,1 +1,2 @@ |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1813 fc627a69481fcbe5f1135069e8a3881c023e4cf5 s |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1814 +60ca1237c19474e7a3978b0dc1ca4e6f36d51382 t |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1815 $ hg log -r 9 --template "{p1node|short} {p2node|short}\n{subrepos % '{subrepo}\n'}" |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1816 f6affe3fbfaa 1f14a2e2d3ec |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1817 t |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1818 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1819 (removal of ".hgsub" itself) |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1820 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1821 $ hg diff --nodates -c 8 .hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1822 diff -r f94576341bcf -r 96615c1dad2d .hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1823 --- a/.hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1824 +++ /dev/null |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1825 @@ -1,2 +0,0 @@ |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1826 -e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1827 -7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4 t |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1828 $ hg log -r 8 --template "{p1node|short} {p2node|short}\n{subrepos % '{subrepo}\n'}" |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1829 f94576341bcf 000000000000 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1830 |
21890
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1831 Test that '[paths]' is configured correctly at subrepo creation |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1832 |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1833 $ cd $TESTTMP/tc |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1834 $ cat > .hgsub <<EOF |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1835 > # to clear bogus subrepo path 'bogus=[boguspath' |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1836 > s = s |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1837 > t = t |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1838 > EOF |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1839 $ hg update -q --clean null |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1840 $ rm -rf s t |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1841 $ cat >> .hg/hgrc <<EOF |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1842 > [paths] |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1843 > default-push = /foo/bar |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1844 > EOF |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1845 $ hg update -q |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1846 $ cat s/.hg/hgrc |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1847 [paths] |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1848 default = $TESTTMP/t/s |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1849 default-push = /foo/bar/s |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1850 $ cat s/ss/.hg/hgrc |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1851 [paths] |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1852 default = $TESTTMP/t/s/ss |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1853 default-push = /foo/bar/s/ss |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1854 $ cat t/.hg/hgrc |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1855 [paths] |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1856 default = $TESTTMP/t/t |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1857 default-push = /foo/bar/t |
25418
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1858 |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1859 $ cd $TESTTMP/t |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1860 $ hg up -qC 0 |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1861 $ echo 'bar' > bar.txt |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1862 $ hg ci -Am 'branch before subrepo add' |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1863 adding bar.txt |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1864 created new head |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1865 $ hg merge -r "first(subrepo('s'))" |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1866 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1867 (branch merge, don't forget to commit) |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1868 $ hg status -S -X '.hgsub*' |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1869 A s/a |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1870 ? s/b |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1871 ? s/c |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1872 ? s/f1 |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1873 $ hg status -S --rev 'p2()' |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1874 A bar.txt |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1875 ? s/b |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1876 ? s/c |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1877 ? s/f1 |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1878 $ hg diff -S -X '.hgsub*' --nodates |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1879 diff -r 000000000000 s/a |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1880 --- /dev/null |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1881 +++ b/s/a |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1882 @@ -0,0 +1,1 @@ |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1883 +a |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1884 $ hg diff -S --rev 'p2()' --nodates |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1885 diff -r 7cf8cfea66e4 bar.txt |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1886 --- /dev/null |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1887 +++ b/bar.txt |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1888 @@ -0,0 +1,1 @@ |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1889 +bar |
c0995cd8ff6f
scmutil: consistently return subrepos relative to ctx1 from itersubrepos()
Matt Harbison <matt_harbison@yahoo.com>
parents:
25382
diff
changeset
|
1890 |
42010
db26dbbee74d
diff: support diffing explicit files in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
41965
diff
changeset
|
1891 $ hg diff -X '.hgsub*' --nodates s |
db26dbbee74d
diff: support diffing explicit files in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
41965
diff
changeset
|
1892 diff -r 000000000000 s/a |
db26dbbee74d
diff: support diffing explicit files in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
41965
diff
changeset
|
1893 --- /dev/null |
db26dbbee74d
diff: support diffing explicit files in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
41965
diff
changeset
|
1894 +++ b/s/a |
db26dbbee74d
diff: support diffing explicit files in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
41965
diff
changeset
|
1895 @@ -0,0 +1,1 @@ |
db26dbbee74d
diff: support diffing explicit files in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
41965
diff
changeset
|
1896 +a |
db26dbbee74d
diff: support diffing explicit files in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
41965
diff
changeset
|
1897 $ hg diff -X '.hgsub*' --nodates s/a |
db26dbbee74d
diff: support diffing explicit files in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
41965
diff
changeset
|
1898 diff -r 000000000000 s/a |
db26dbbee74d
diff: support diffing explicit files in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
41965
diff
changeset
|
1899 --- /dev/null |
db26dbbee74d
diff: support diffing explicit files in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
41965
diff
changeset
|
1900 +++ b/s/a |
db26dbbee74d
diff: support diffing explicit files in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
41965
diff
changeset
|
1901 @@ -0,0 +1,1 @@ |
db26dbbee74d
diff: support diffing explicit files in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
41965
diff
changeset
|
1902 +a |
db26dbbee74d
diff: support diffing explicit files in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
41965
diff
changeset
|
1903 |
21890
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1904 $ cd .. |
33656
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1905 |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1906 test for ssh exploit 2017-07-25 |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1907 |
33660
3fee7f7d2da0
ssh: unban the use of pipe character in user@host:port string
Yuya Nishihara <yuya@tcha.org>
parents:
33656
diff
changeset
|
1908 $ cat >> $HGRCPATH << EOF |
3fee7f7d2da0
ssh: unban the use of pipe character in user@host:port string
Yuya Nishihara <yuya@tcha.org>
parents:
33656
diff
changeset
|
1909 > [ui] |
3fee7f7d2da0
ssh: unban the use of pipe character in user@host:port string
Yuya Nishihara <yuya@tcha.org>
parents:
33656
diff
changeset
|
1910 > ssh = sh -c "read l; read l; read l" |
3fee7f7d2da0
ssh: unban the use of pipe character in user@host:port string
Yuya Nishihara <yuya@tcha.org>
parents:
33656
diff
changeset
|
1911 > EOF |
3fee7f7d2da0
ssh: unban the use of pipe character in user@host:port string
Yuya Nishihara <yuya@tcha.org>
parents:
33656
diff
changeset
|
1912 |
33656
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1913 $ hg init malicious-proxycommand |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1914 $ cd malicious-proxycommand |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1915 $ echo 's = [hg]ssh://-oProxyCommand=touch${IFS}owned/path' > .hgsub |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1916 $ hg init s |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1917 $ cd s |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1918 $ echo init > init |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1919 $ hg add |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1920 adding init |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1921 $ hg commit -m init |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1922 $ cd .. |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1923 $ hg add .hgsub |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1924 $ hg ci -m 'add subrepo' |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1925 $ cd .. |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1926 $ hg clone malicious-proxycommand malicious-proxycommand-clone |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1927 updating to branch default |
40655
69d4c8c5c25e
subrepo: print the status line before creating the peer for better diagnostics
Matt Harbison <matt_harbison@yahoo.com>
parents:
39369
diff
changeset
|
1928 cloning subrepo s from ssh://-oProxyCommand%3Dtouch%24%7BIFS%7Downed/path |
33656
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1929 abort: potentially unsafe url: 'ssh://-oProxyCommand=touch${IFS}owned/path' (in subrepository "s") |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1930 [255] |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1931 |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1932 also check that a percent encoded '-' (%2D) doesn't work |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1933 |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1934 $ cd malicious-proxycommand |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1935 $ echo 's = [hg]ssh://%2DoProxyCommand=touch${IFS}owned/path' > .hgsub |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1936 $ hg ci -m 'change url to percent encoded' |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1937 $ cd .. |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1938 $ rm -r malicious-proxycommand-clone |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1939 $ hg clone malicious-proxycommand malicious-proxycommand-clone |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1940 updating to branch default |
40655
69d4c8c5c25e
subrepo: print the status line before creating the peer for better diagnostics
Matt Harbison <matt_harbison@yahoo.com>
parents:
39369
diff
changeset
|
1941 cloning subrepo s from ssh://-oProxyCommand%3Dtouch%24%7BIFS%7Downed/path |
33656
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1942 abort: potentially unsafe url: 'ssh://-oProxyCommand=touch${IFS}owned/path' (in subrepository "s") |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1943 [255] |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1944 |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1945 also check for a pipe |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1946 |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1947 $ cd malicious-proxycommand |
33660
3fee7f7d2da0
ssh: unban the use of pipe character in user@host:port string
Yuya Nishihara <yuya@tcha.org>
parents:
33656
diff
changeset
|
1948 $ echo 's = [hg]ssh://fakehost|touch${IFS}owned/path' > .hgsub |
33656
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1949 $ hg ci -m 'change url to pipe' |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1950 $ cd .. |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1951 $ rm -r malicious-proxycommand-clone |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1952 $ hg clone malicious-proxycommand malicious-proxycommand-clone |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1953 updating to branch default |
40655
69d4c8c5c25e
subrepo: print the status line before creating the peer for better diagnostics
Matt Harbison <matt_harbison@yahoo.com>
parents:
39369
diff
changeset
|
1954 cloning subrepo s from ssh://fakehost%7Ctouch%24%7BIFS%7Downed/path |
33660
3fee7f7d2da0
ssh: unban the use of pipe character in user@host:port string
Yuya Nishihara <yuya@tcha.org>
parents:
33656
diff
changeset
|
1955 abort: no suitable response from remote hg! |
33656
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1956 [255] |
33660
3fee7f7d2da0
ssh: unban the use of pipe character in user@host:port string
Yuya Nishihara <yuya@tcha.org>
parents:
33656
diff
changeset
|
1957 $ [ ! -f owned ] || echo 'you got owned' |
33656
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1958 |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1959 also check that a percent encoded '|' (%7C) doesn't work |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1960 |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1961 $ cd malicious-proxycommand |
33660
3fee7f7d2da0
ssh: unban the use of pipe character in user@host:port string
Yuya Nishihara <yuya@tcha.org>
parents:
33656
diff
changeset
|
1962 $ echo 's = [hg]ssh://fakehost%7Ctouch%20owned/path' > .hgsub |
33656
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1963 $ hg ci -m 'change url to percent encoded pipe' |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1964 $ cd .. |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1965 $ rm -r malicious-proxycommand-clone |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1966 $ hg clone malicious-proxycommand malicious-proxycommand-clone |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1967 updating to branch default |
40655
69d4c8c5c25e
subrepo: print the status line before creating the peer for better diagnostics
Matt Harbison <matt_harbison@yahoo.com>
parents:
39369
diff
changeset
|
1968 cloning subrepo s from ssh://fakehost%7Ctouch%20owned/path |
33660
3fee7f7d2da0
ssh: unban the use of pipe character in user@host:port string
Yuya Nishihara <yuya@tcha.org>
parents:
33656
diff
changeset
|
1969 abort: no suitable response from remote hg! |
33656
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1970 [255] |
33660
3fee7f7d2da0
ssh: unban the use of pipe character in user@host:port string
Yuya Nishihara <yuya@tcha.org>
parents:
33656
diff
changeset
|
1971 $ [ ! -f owned ] || echo 'you got owned' |
33656
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1972 |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1973 and bad usernames: |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1974 $ cd malicious-proxycommand |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1975 $ echo 's = [hg]ssh://-oProxyCommand=touch owned@example.com/path' > .hgsub |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1976 $ hg ci -m 'owned username' |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1977 $ cd .. |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1978 $ rm -r malicious-proxycommand-clone |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1979 $ hg clone malicious-proxycommand malicious-proxycommand-clone |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1980 updating to branch default |
40655
69d4c8c5c25e
subrepo: print the status line before creating the peer for better diagnostics
Matt Harbison <matt_harbison@yahoo.com>
parents:
39369
diff
changeset
|
1981 cloning subrepo s from ssh://-oProxyCommand%3Dtouch%20owned@example.com/path |
33656
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1982 abort: potentially unsafe url: 'ssh://-oProxyCommand=touch owned@example.com/path' (in subrepository "s") |
475af2f89636
subrepo: add tests for hg rogue ssh urls (SEC)
Sean Farley <sean@farley.io>
parents:
33365
diff
changeset
|
1983 [255] |
38425
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
1984 |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
1985 Test convert subrepositories including merge (issue5526): |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
1986 |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
1987 $ hg init tconv |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
1988 $ hg convert --config extensions.convert= -q t/s tconv/s |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
1989 $ hg convert --config extensions.convert= -q t/s/ss tconv/s/ss |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
1990 $ hg convert --config extensions.convert= -q t/t tconv/t |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
1991 |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
1992 convert shouldn't fail because of pseudo filenode: |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
1993 |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
1994 $ hg convert --config extensions.convert= t tconv |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
1995 scanning source... |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
1996 sorting... |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
1997 converting... |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
1998 17 0 |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
1999 16 1 |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
2000 15 2 |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
2001 14 3 |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
2002 13 4 |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
2003 12 5 |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
2004 11 6 |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
2005 10 7 |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
2006 9 8 |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
2007 8 9 |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
2008 7 10 |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
2009 6 11 |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
2010 5 12 |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
2011 4 13 |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
2012 3 rm2 |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
2013 2 phasecheck4 |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
2014 1 16 |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
2015 0 branch before subrepo add |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
2016 |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
2017 converted .hgsubstate should point to valid nodes: |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
2018 |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
2019 $ hg up -R tconv 9 |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
2020 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
2021 $ cat tconv/.hgsubstate |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
2022 fc627a69481fcbe5f1135069e8a3881c023e4cf5 s |
1322ae04d3d7
merge: do not fill manifest of committed revision with pseudo node (issue5526)
Yuya Nishihara <yuya@tcha.org>
parents:
35704
diff
changeset
|
2023 60ca1237c19474e7a3978b0dc1ca4e6f36d51382 t |