Mercurial > hg
annotate tests/test-subrepo.t @ 22859:513c0ba61db8
addset: do lazy sorting
The previous implementation was consuming the whole revset when asked for any
sort. The addset class is now doing lazy sorting like all other smarset classes.
This has no significant impact in the benchmark as-is. But this is important
to later change.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Thu, 09 Oct 2014 20:15:41 -0700 |
parents | d4c972b97fee |
children | bbe56e07e07a |
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 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
28 $ hg -R s ci -Ams0 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
29 adding a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
30 $ hg sum |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
31 parent: 0:f7b1eb17ad24 tip |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
32 0 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
33 branch: default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
34 commit: 1 added, 1 subrepos |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
35 update: (current) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
36 $ hg ci -m1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
37 |
20827
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
38 test handling .hgsubstate "added" explicitly. |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
39 |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
40 $ 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
|
41 7cf8cfea66e410e8e3336508dfeec07b3192de51 |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
42 .hgsub .hgsubstate |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
43 $ hg rollback -q |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
44 $ hg add .hgsubstate |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
45 $ hg ci -m1 |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
46 $ 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
|
47 7cf8cfea66e410e8e3336508dfeec07b3192de51 |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
48 .hgsub .hgsubstate |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
49 |
16454
92c7e917b647
tests: add test for fileset 'subrepo' keyword
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
16430
diff
changeset
|
50 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
|
51 |
460135339d74
revert: warn that subrepos cannot be reverted
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
15231
diff
changeset
|
52 $ echo b > s/a |
16454
92c7e917b647
tests: add test for fileset 'subrepo' keyword
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
16430
diff
changeset
|
53 $ 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
|
54 reverting subrepo s |
16540
4fe8eb4a6e2c
tests: add missing accept of native pathname separator
Mads Kiilerich <mads@kiilerich.com>
parents:
16454
diff
changeset
|
55 reverting s/a (glob) |
16430
6883c2363f44
revert: add support for reverting subrepos without --no-backup and/or --all
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
16429
diff
changeset
|
56 $ rm s/a.orig |
15265
460135339d74
revert: warn that subrepos cannot be reverted
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
15231
diff
changeset
|
57 |
16430
6883c2363f44
revert: add support for reverting subrepos without --no-backup and/or --all
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
16429
diff
changeset
|
58 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
|
59 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
|
60 |
6883c2363f44
revert: add support for reverting subrepos without --no-backup and/or --all
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
16429
diff
changeset
|
61 $ 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
|
62 $ 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
|
63 reverting subrepo s |
15265
460135339d74
revert: warn that subrepos cannot be reverted
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
15231
diff
changeset
|
64 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12376
diff
changeset
|
65 Issue2022: update -C |
11485
b602a95c21ec
subrepo: refuse to commit subrepos if .hgsub is excluded (issue2232)
Matt Mackall <mpm@selenic.com>
parents:
11470
diff
changeset
|
66 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
67 $ echo b > s/a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
68 $ hg sum |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
69 parent: 1:7cf8cfea66e4 tip |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
70 1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
71 branch: default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
72 commit: 1 subrepos |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
73 update: (current) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
74 $ hg co -C 1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
75 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
|
76 $ hg sum |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
77 parent: 1:7cf8cfea66e4 tip |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
78 1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
79 branch: default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
80 commit: (clean) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
81 update: (current) |
11485
b602a95c21ec
subrepo: refuse to commit subrepos if .hgsub is excluded (issue2232)
Matt Mackall <mpm@selenic.com>
parents:
11470
diff
changeset
|
82 |
15231
cd6f10dccf16
cmdutil.bailifchanged: abort for dirty subrepos
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
14536
diff
changeset
|
83 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
|
84 |
cd6f10dccf16
cmdutil.bailifchanged: abort for dirty subrepos
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
14536
diff
changeset
|
85 $ echo b >> s/a |
cd6f10dccf16
cmdutil.bailifchanged: abort for dirty subrepos
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
14536
diff
changeset
|
86 $ hg backout tip |
cd6f10dccf16
cmdutil.bailifchanged: abort for dirty subrepos
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
14536
diff
changeset
|
87 abort: uncommitted changes in subrepo s |
cd6f10dccf16
cmdutil.bailifchanged: abort for dirty subrepos
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
14536
diff
changeset
|
88 [255] |
cd6f10dccf16
cmdutil.bailifchanged: abort for dirty subrepos
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
14536
diff
changeset
|
89 $ 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
|
90 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
91 add sub sub |
8816 | 92 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
93 $ echo ss = ss > s/.hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
94 $ hg init s/ss |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
95 $ echo a > s/ss/a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
96 $ hg -R s add s/.hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
97 $ hg -R s/ss add s/ss/a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
98 $ hg sum |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
99 parent: 1:7cf8cfea66e4 tip |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
100 1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
101 branch: default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
102 commit: 1 subrepos |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
103 update: (current) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
104 $ hg ci -m2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
105 committing subrepository s |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
106 committing subrepository s/ss (glob) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
107 $ hg sum |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
108 parent: 2:df30734270ae tip |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
109 2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
110 branch: default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
111 commit: (clean) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
112 update: (current) |
11470
34e33d50c26b
subrepo: correctly handle update -C with modified subrepos (issue2022)
Matt Mackall <mpm@selenic.com>
parents:
11088
diff
changeset
|
113 |
20827
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
114 test handling .hgsubstate "modified" explicitly. |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
115 |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
116 $ 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
|
117 df30734270ae757feb35e643b7018e818e78a9aa |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
118 .hgsubstate |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
119 $ hg rollback -q |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
120 $ hg status -A .hgsubstate |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
121 M .hgsubstate |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
122 $ hg ci -m2 |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
123 $ 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
|
124 df30734270ae757feb35e643b7018e818e78a9aa |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
125 .hgsubstate |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
126 |
13411
d4de90a612f7
commit: abort if a subrepo is modified and ui.commitsubrepos=no
Patrick Mezard <pmezard@gmail.com>
parents:
13322
diff
changeset
|
127 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
|
128 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
129 $ echo b > s/a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
130 $ 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
|
131 $ hg --config ui.commitsubrepos=no ci -m3 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
132 |
13411
d4de90a612f7
commit: abort if a subrepo is modified and ui.commitsubrepos=no
Patrick Mezard <pmezard@gmail.com>
parents:
13322
diff
changeset
|
133 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
|
134 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
135 $ 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
|
136 $ hg --config ui.commitsubrepos=no ci -m4 |
d4de90a612f7
commit: abort if a subrepo is modified and ui.commitsubrepos=no
Patrick Mezard <pmezard@gmail.com>
parents:
13322
diff
changeset
|
137 abort: uncommitted changes in subrepo s |
15321
e174353e8cda
subrepos: abort commit by default if a subrepo is dirty (BC)
Martin Geisler <mg@lazybytes.net>
parents:
15265
diff
changeset
|
138 (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
|
139 [255] |
17255
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
140 $ hg id |
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
141 f6affe3fbfaa+ tip |
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
142 $ hg -R s ci -mc |
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
143 $ hg id |
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
144 f6affe3fbfaa+ tip |
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
145 $ echo d > s/a |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
146 $ hg ci -m4 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
147 committing subrepository s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
148 $ hg tip -R s |
17255
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
149 changeset: 4:02dcf1d70411 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
150 tag: tip |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
151 user: test |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
152 date: Thu Jan 01 00:00:00 1970 +0000 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
153 summary: 4 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
154 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
155 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
156 check caching |
8816 | 157 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
158 $ hg co 0 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
159 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
|
160 $ hg debugsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
161 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
162 restore |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
163 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
164 $ hg co |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
165 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
|
166 $ hg debugsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
167 path s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
168 source s |
17255
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
169 revision 02dcf1d704118aee3ee306ccfa1910850d5b05ef |
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 new branch for merge tests |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
172 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
173 $ hg co 1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
174 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
|
175 $ echo t = t >> .hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
176 $ hg init t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
177 $ echo t > t/t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
178 $ hg -R t add t |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
179 adding t/t (glob) |
8816 | 180 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
181 5 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
182 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
183 $ hg ci -m5 # add sub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
184 committing subrepository t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
185 created new head |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
186 $ echo t2 > t/t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
187 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
188 6 |
8816 | 189 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
190 $ hg st -R s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
191 $ hg ci -m6 # change sub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
192 committing subrepository t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
193 $ hg debugsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
194 path s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
195 source s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
196 revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
197 path t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
198 source t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
199 revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
200 $ echo t3 > t/t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
201 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
202 7 |
8816 | 203 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
204 $ hg ci -m7 # change sub again for conflict test |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
205 committing subrepository t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
206 $ hg rm .hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
207 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
208 8 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
209 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
210 $ hg ci -m8 # remove sub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
211 |
20827
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
212 test handling .hgsubstate "removed" explicitly. |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
213 |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
214 $ 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
|
215 96615c1dad2dc8e3796d7332c77ce69156f7b78e |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
216 .hgsub .hgsubstate |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
217 $ hg rollback -q |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
218 $ hg remove .hgsubstate |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
219 $ hg ci -m8 |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
220 $ 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
|
221 96615c1dad2dc8e3796d7332c77ce69156f7b78e |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
222 .hgsub .hgsubstate |
ca5dd216cb62
localrepo: omit ".hgsubstate" also from "added" files
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
20772
diff
changeset
|
223 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
224 merge tests |
8816 | 225 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
226 $ hg co -C 3 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
227 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
|
228 $ hg merge 5 # test adding |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
229 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
|
230 (branch merge, don't forget to commit) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
231 $ hg debugsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
232 path s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
233 source s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
234 revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
235 path t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
236 source t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
237 revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
238 $ hg ci -m9 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
239 created new head |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
240 $ hg merge 6 --debug # test change |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
241 searching for copies back to rev 2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
242 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18556
diff
changeset
|
243 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
15623
diff
changeset
|
244 ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
245 .hgsubstate: versions differ -> m |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
246 updating: .hgsubstate 1/1 files (100.00%) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
247 subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
248 subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
249 getting subrepo t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
250 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18556
diff
changeset
|
251 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
|
252 ancestor: 60ca1237c194, local: 60ca1237c194+, remote: 6747d179aa9a |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
253 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
|
254 getting t |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
255 updating: t 1/1 files (100.00%) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
256 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
|
257 (branch merge, don't forget to commit) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
258 $ hg debugsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
259 path s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
260 source s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
261 revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
262 path t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
263 source t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
264 revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
265 $ echo conflict > t/t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
266 $ hg ci -m10 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
267 committing subrepository t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
268 $ HGMERGE=internal:merge hg merge --debug 7 # test conflict |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
269 searching for copies back to rev 2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
270 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18556
diff
changeset
|
271 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
15623
diff
changeset
|
272 ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
273 .hgsubstate: versions differ -> m |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
274 updating: .hgsubstate 1/1 files (100.00%) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
275 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
|
276 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
|
277 subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198) |
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
|
278 (M)erge, keep (l)ocal or keep (r)emote? m |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
279 merging subrepo t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
280 searching for copies back to rev 2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
281 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18556
diff
changeset
|
282 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
15623
diff
changeset
|
283 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
21041
diff
changeset
|
284 preserving t for resolve of t |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
285 t: versions differ -> m |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
286 updating: t 1/1 files (100.00%) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
287 picked tool 'internal:merge' for t (binary False symlink False) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
288 merging t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
289 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
290 warning: conflicts during merge. |
15501
2371f4aea665
merge: give a special message for internal:merge failure (issue3105)
Matt Mackall <mpm@selenic.com>
parents:
15474
diff
changeset
|
291 merging t incomplete! (edit conflicts, then use 'hg resolve --mark') |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
292 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
12314
f2daa6ab514a
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Brodie Rao <brodie@bitheap.org>
parents:
12127
diff
changeset
|
293 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' 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
|
294 subrepo t: merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
295 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
|
296 (branch merge, don't forget to commit) |
8816 | 297 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
298 should conflict |
8816 | 299 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
300 $ cat t/t |
21693
9c35f3a8cac4
merge: drop the quotes around commit description
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21519
diff
changeset
|
301 <<<<<<< local: 20a0db6fbf6c - test: 10 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
302 conflict |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
303 ======= |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
304 t3 |
21693
9c35f3a8cac4
merge: drop the quotes around commit description
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21519
diff
changeset
|
305 >>>>>>> other: 7af322bc1198 - test: 7 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
306 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
307 clone |
8816 | 308 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
309 $ cd .. |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
310 $ hg clone t tc |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
311 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
|
312 cloning subrepo s from $TESTTMP/t/s |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16540
diff
changeset
|
313 cloning subrepo s/ss from $TESTTMP/t/s/ss (glob) |
18720
0ade08dcb3c3
tests: remove glob lines which unnecessary match / for \ on windows
Simon Heimberg <simohe@besonet.ch>
parents:
18631
diff
changeset
|
314 cloning subrepo t from $TESTTMP/t/t |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
315 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
|
316 $ cd tc |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
317 $ hg debugsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
318 path s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
319 source s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
320 revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
321 path t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
322 source t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
323 revision 20a0db6fbf6c3d2836e6519a642ae929bfc67c0e |
8816 | 324 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
325 push |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
326 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
327 $ echo bah > t/t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
328 $ hg ci -m11 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
329 committing subrepository t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
330 $ hg push |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16540
diff
changeset
|
331 pushing to $TESTTMP/t (glob) |
19117
a6542a670ece
tests: sprinkle globs over largefiles/subrepo tests for Windows
Brendan Cully <brendan@kublai.com>
parents:
18965
diff
changeset
|
332 no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) |
18941
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
333 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
|
334 pushing subrepo t to $TESTTMP/t/t |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
335 searching for changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
336 adding changesets |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
337 adding manifests |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
338 adding file changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
339 added 1 changesets with 1 changes to 1 files |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
340 searching for changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
341 adding changesets |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
342 adding manifests |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
343 adding file changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
344 added 1 changesets with 1 changes to 1 files |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
345 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
346 push -f |
10251
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8816
diff
changeset
|
347 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
348 $ echo bah > s/a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
349 $ hg ci -m12 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
350 committing subrepository s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
351 $ hg push |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16540
diff
changeset
|
352 pushing to $TESTTMP/t (glob) |
19117
a6542a670ece
tests: sprinkle globs over largefiles/subrepo tests for Windows
Brendan Cully <brendan@kublai.com>
parents:
18965
diff
changeset
|
353 no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) |
18720
0ade08dcb3c3
tests: remove glob lines which unnecessary match / for \ on windows
Simon Heimberg <simohe@besonet.ch>
parents:
18631
diff
changeset
|
354 pushing subrepo s to $TESTTMP/t/s |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
355 searching for changes |
18109
9e3910db4e78
subrepo: append subrepo path to subrepo error messages
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
17938
diff
changeset
|
356 abort: push creates new remote head 12a213df6fa9! (in subrepo s) |
19934
bfc6ed892349
push: hide description about "-f" in the hint to prevent from using it easily
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19811
diff
changeset
|
357 (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
|
358 [255] |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
359 $ hg push -f |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16540
diff
changeset
|
360 pushing to $TESTTMP/t (glob) |
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16540
diff
changeset
|
361 pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
362 searching for changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
363 no changes found |
18720
0ade08dcb3c3
tests: remove glob lines which unnecessary match / for \ on windows
Simon Heimberg <simohe@besonet.ch>
parents:
18631
diff
changeset
|
364 pushing subrepo s to $TESTTMP/t/s |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
365 searching for changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
366 adding changesets |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
367 adding manifests |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
368 adding file changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
369 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
|
370 pushing subrepo t to $TESTTMP/t/t |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
371 searching for changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
372 no changes found |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
373 searching for changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
374 adding changesets |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
375 adding manifests |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
376 adding file changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
377 added 1 changesets with 1 changes to 1 files |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
378 |
18941
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
379 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
|
380 |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
381 $ hg clone . ../tcc |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
382 updating to branch default |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
383 cloning subrepo s from $TESTTMP/tc/s |
19117
a6542a670ece
tests: sprinkle globs over largefiles/subrepo tests for Windows
Brendan Cully <brendan@kublai.com>
parents:
18965
diff
changeset
|
384 cloning subrepo s/ss from $TESTTMP/tc/s/ss (glob) |
18941
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
385 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
|
386 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
|
387 |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
388 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
|
389 |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
390 $ hg push -R ../tcc . |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
391 pushing to . |
19117
a6542a670ece
tests: sprinkle globs over largefiles/subrepo tests for Windows
Brendan Cully <brendan@kublai.com>
parents:
18965
diff
changeset
|
392 no changes made to subrepo s/ss since last push to s/ss (glob) |
18941
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
393 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
|
394 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
|
395 searching for changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
396 no changes found |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
397 [1] |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
398 |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
399 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
|
400 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
|
401 |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
402 $ hg push ../tcc |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
403 pushing to ../tcc |
19117
a6542a670ece
tests: sprinkle globs over largefiles/subrepo tests for Windows
Brendan Cully <brendan@kublai.com>
parents:
18965
diff
changeset
|
404 pushing subrepo s/ss to ../tcc/s/ss (glob) |
18941
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
405 searching for changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
406 no changes found |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
407 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
|
408 searching for changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
409 no changes found |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
410 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
|
411 searching for changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
412 no changes found |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
413 searching for changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
414 no changes found |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
415 [1] |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
416 |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
417 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
|
418 |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
419 $ hg push ../tcc |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
420 pushing to ../tcc |
19117
a6542a670ece
tests: sprinkle globs over largefiles/subrepo tests for Windows
Brendan Cully <brendan@kublai.com>
parents:
18965
diff
changeset
|
421 no changes made to subrepo s/ss since last push to ../tcc/s/ss (glob) |
18941
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
422 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
|
423 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
|
424 searching for changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
425 no changes found |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
426 [1] |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
427 |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
428 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
|
429 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
|
430 |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
431 $ hg -R s update '.^' |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
432 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
|
433 $ hg push |
19218
475a4b13263f
tests: backport some glob fixups
Matt Mackall <mpm@selenic.com>
parents:
19165
diff
changeset
|
434 pushing to $TESTTMP/t (glob) |
19117
a6542a670ece
tests: sprinkle globs over largefiles/subrepo tests for Windows
Brendan Cully <brendan@kublai.com>
parents:
18965
diff
changeset
|
435 no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) |
18941
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
436 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
|
437 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
|
438 searching for changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
439 no changes found |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
440 [1] |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
441 $ echo foo >> s/a |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
442 $ hg push |
19218
475a4b13263f
tests: backport some glob fixups
Matt Mackall <mpm@selenic.com>
parents:
19165
diff
changeset
|
443 pushing to $TESTTMP/t (glob) |
19117
a6542a670ece
tests: sprinkle globs over largefiles/subrepo tests for Windows
Brendan Cully <brendan@kublai.com>
parents:
18965
diff
changeset
|
444 no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) |
18941
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
445 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
|
446 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
|
447 searching for changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
448 no changes found |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
449 [1] |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
450 $ 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
|
451 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
|
452 |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
453 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
|
454 |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
455 $ echo foo >> s/ss/a |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
456 $ hg -R s/ss commit -m 'test dirty store detection' |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
457 $ hg push |
19218
475a4b13263f
tests: backport some glob fixups
Matt Mackall <mpm@selenic.com>
parents:
19165
diff
changeset
|
458 pushing to $TESTTMP/t (glob) |
19117
a6542a670ece
tests: sprinkle globs over largefiles/subrepo tests for Windows
Brendan Cully <brendan@kublai.com>
parents:
18965
diff
changeset
|
459 pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) |
18941
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
460 searching for changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
461 adding changesets |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
462 adding manifests |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
463 adding file changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
464 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
|
465 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
|
466 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
|
467 searching for changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
468 no changes found |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
469 [1] |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
470 |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
471 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
|
472 |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
473 $ hg push |
19218
475a4b13263f
tests: backport some glob fixups
Matt Mackall <mpm@selenic.com>
parents:
19165
diff
changeset
|
474 pushing to $TESTTMP/t (glob) |
19117
a6542a670ece
tests: sprinkle globs over largefiles/subrepo tests for Windows
Brendan Cully <brendan@kublai.com>
parents:
18965
diff
changeset
|
475 no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) |
18941
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
476 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
|
477 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
|
478 searching for changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
479 no changes found |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
480 [1] |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
481 $ hg push ../tcc |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
482 pushing to ../tcc |
19165
98406218117a
tests: fix another Windows path issue
Matt Mackall <mpm@selenic.com>
parents:
19117
diff
changeset
|
483 pushing subrepo s/ss to ../tcc/s/ss (glob) |
18941
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
484 searching for changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
485 adding changesets |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
486 adding manifests |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
487 adding file changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
488 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
|
489 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
|
490 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
|
491 searching for changes |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
492 no changes found |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
493 [1] |
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
494 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
495 update |
10177
5ca0d220ae21
subrepo: add table-based dispatch for subrepo types
Augie Fackler <durin42@gmail.com>
parents:
8816
diff
changeset
|
496 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
497 $ cd ../t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
498 $ hg up -C # discard our earlier merge |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
499 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
|
500 $ echo blah > t/t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
501 $ hg ci -m13 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
502 committing subrepository t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
503 |
18943
27e8dfc2c338
subrepo: fix exception on revert when "all" option is omitted
Yuya Nishihara <yuya@tcha.org>
parents:
18941
diff
changeset
|
504 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
|
505 KeyError |
27e8dfc2c338
subrepo: fix exception on revert when "all" option is omitted
Yuya Nishihara <yuya@tcha.org>
parents:
18941
diff
changeset
|
506 |
27e8dfc2c338
subrepo: fix exception on revert when "all" option is omitted
Yuya Nishihara <yuya@tcha.org>
parents:
18941
diff
changeset
|
507 $ hg backout ".^" |
27e8dfc2c338
subrepo: fix exception on revert when "all" option is omitted
Yuya Nishihara <yuya@tcha.org>
parents:
18941
diff
changeset
|
508 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
|
509 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
|
510 |
27e8dfc2c338
subrepo: fix exception on revert when "all" option is omitted
Yuya Nishihara <yuya@tcha.org>
parents:
18941
diff
changeset
|
511 $ 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
|
512 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
27e8dfc2c338
subrepo: fix exception on revert when "all" option is omitted
Yuya Nishihara <yuya@tcha.org>
parents:
18941
diff
changeset
|
513 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
514 pull |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
515 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
516 $ cd ../tc |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
517 $ hg pull |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16540
diff
changeset
|
518 pulling from $TESTTMP/t (glob) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
519 searching for changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
520 adding changesets |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
521 adding manifests |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
522 adding file changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
523 added 1 changesets with 1 changes to 1 files |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
524 (run 'hg update' to get a working copy) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
525 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
526 should pull t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
527 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
528 $ hg up |
18720
0ade08dcb3c3
tests: remove glob lines which unnecessary match / for \ on windows
Simon Heimberg <simohe@besonet.ch>
parents:
18631
diff
changeset
|
529 pulling subrepo t from $TESTTMP/t/t |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
530 searching for changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
531 adding changesets |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
532 adding manifests |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
533 adding file changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
534 added 1 changesets with 1 changes to 1 files |
18941
cb5f5859b3fd
test-subrepo: add tests for subrepo "storeclean" checks
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
18720
diff
changeset
|
535 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
536 $ cat t/t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
537 blah |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
538 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
539 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
|
540 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
541 $ echo 'bogus=[boguspath' >> .hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
542 $ hg ci -m 'bogus subrepo path' |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
543 abort: missing ] in subrepo source |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
544 [255] |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
545 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12376
diff
changeset
|
546 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
|
547 shouldn't need merging |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
548 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
549 # subrepo layout |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
550 # |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
551 # o 5 br |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
552 # /| |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
553 # o | 4 default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
554 # | | |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
555 # | o 3 br |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
556 # |/| |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
557 # o | 2 default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
558 # | | |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
559 # | o 1 br |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
560 # |/ |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
561 # o 0 default |
10251
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8816
diff
changeset
|
562 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
563 $ cd .. |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
564 $ rm -rf sub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
565 $ hg init main |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
566 $ cd main |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
567 $ hg init s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
568 $ cd s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
569 $ echo a > a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
570 $ hg ci -Am1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
571 adding a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
572 $ hg branch br |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
573 marked working directory as branch br |
15615 | 574 (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
|
575 $ echo a >> a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
576 $ hg ci -m1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
577 $ hg up default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
578 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
|
579 $ echo b > b |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
580 $ hg ci -Am1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
581 adding b |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
582 $ hg up br |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
583 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
|
584 $ hg merge tip |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
585 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
|
586 (branch merge, don't forget to commit) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
587 $ hg ci -m1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
588 $ hg up 2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
589 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
|
590 $ echo c > c |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
591 $ hg ci -Am1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
592 adding c |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
593 $ hg up 3 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
594 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
|
595 $ hg merge 4 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
596 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
|
597 (branch merge, don't forget to commit) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
598 $ hg ci -m1 |
10251
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8816
diff
changeset
|
599 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
600 # main repo layout: |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
601 # |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
602 # * <-- try to merge default into br again |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
603 # .`| |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
604 # . o 5 br --> substate = 5 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
605 # . | |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
606 # o | 4 default --> substate = 4 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
607 # | | |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
608 # | o 3 br --> substate = 2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
609 # |/| |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
610 # o | 2 default --> substate = 2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
611 # | | |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
612 # | o 1 br --> substate = 3 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
613 # |/ |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
614 # 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
|
615 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
616 $ cd .. |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
617 $ echo 's = s' > .hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
618 $ hg -R s up 2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
619 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
|
620 $ hg ci -Am1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
621 adding .hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
622 $ hg branch br |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
623 marked working directory as branch br |
15615 | 624 (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
|
625 $ echo b > b |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
626 $ hg -R s up 3 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
627 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
|
628 $ hg ci -Am1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
629 adding b |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
630 $ hg up default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
631 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
|
632 $ echo c > c |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
633 $ hg ci -Am1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
634 adding c |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
635 $ hg up 1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
636 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
|
637 $ hg merge 2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
638 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
|
639 (branch merge, don't forget to commit) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
640 $ hg ci -m1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
641 $ hg up 2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
642 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
|
643 $ hg -R s up 4 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
644 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
|
645 $ echo d > d |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
646 $ hg ci -Am1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
647 adding d |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
648 $ hg up 3 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
649 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
|
650 $ hg -R s up 5 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
651 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
|
652 $ echo e > e |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
653 $ hg ci -Am1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
654 adding e |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
655 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
656 $ hg up 5 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
657 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
|
658 $ 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
|
659 subrepository s diverged (local revision: f8f13b33206e, remote revision: a3f9062a4f88) |
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
|
660 (M)erge, keep (l)ocal or keep (r)emote? m |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
661 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
|
662 (branch merge, don't forget to commit) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
663 $ cd .. |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
664 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
665 test subrepo delete from .hgsubstate |
10522
b07d487009b2
subrepo: Update .hgsubstate in case of deleted subrepo
Saint Germain <saintger@gmail.com>
parents:
10468
diff
changeset
|
666 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
667 $ hg init testdelete |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
668 $ mkdir testdelete/nested testdelete/nested2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
669 $ hg init testdelete/nested |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
670 $ hg init testdelete/nested2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
671 $ echo test > testdelete/nested/foo |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
672 $ echo test > testdelete/nested2/foo |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
673 $ hg -R testdelete/nested add |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
674 adding testdelete/nested/foo (glob) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
675 $ hg -R testdelete/nested2 add |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
676 adding testdelete/nested2/foo (glob) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
677 $ hg -R testdelete/nested ci -m test |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
678 $ hg -R testdelete/nested2 ci -m test |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
679 $ echo nested = nested > testdelete/.hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
680 $ echo nested2 = nested2 >> testdelete/.hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
681 $ hg -R testdelete add |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
682 adding testdelete/.hgsub (glob) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
683 $ hg -R testdelete ci -m "nested 1 & 2 added" |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
684 $ echo nested = nested > testdelete/.hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
685 $ hg -R testdelete ci -m "nested 2 deleted" |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
686 $ cat testdelete/.hgsubstate |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
687 bdf5c9a3103743d900b12ae0db3ffdcfd7b0d878 nested |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
688 $ hg -R testdelete remove testdelete/.hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
689 $ hg -R testdelete ci -m ".hgsub deleted" |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
690 $ 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
|
691 bdf5c9a3103743d900b12ae0db3ffdcfd7b0d878 nested |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
692 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
693 test repository cloning |
10251
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8816
diff
changeset
|
694 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
695 $ mkdir mercurial mercurial2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
696 $ hg init nested_absolute |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
697 $ echo test > nested_absolute/foo |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
698 $ hg -R nested_absolute add |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
699 adding nested_absolute/foo (glob) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
700 $ hg -R nested_absolute ci -mtest |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
701 $ cd mercurial |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
702 $ hg init nested_relative |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
703 $ echo test2 > nested_relative/foo2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
704 $ hg -R nested_relative add |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
705 adding nested_relative/foo2 (glob) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
706 $ hg -R nested_relative ci -mtest2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
707 $ hg init main |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
708 $ echo "nested_relative = ../nested_relative" > main/.hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
709 $ echo "nested_absolute = `pwd`/nested_absolute" >> main/.hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
710 $ hg -R main add |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
711 adding main/.hgsub (glob) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
712 $ hg -R main ci -m "add subrepos" |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
713 $ cd .. |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
714 $ hg clone mercurial/main mercurial2/main |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
715 updating to branch default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
716 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
|
717 $ cat mercurial2/main/nested_absolute/.hg/hgrc \ |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
718 > mercurial2/main/nested_relative/.hg/hgrc |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
719 [paths] |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16540
diff
changeset
|
720 default = $TESTTMP/mercurial/nested_absolute |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
721 [paths] |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16540
diff
changeset
|
722 default = $TESTTMP/mercurial/nested_relative |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
723 $ rm -rf mercurial mercurial2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
724 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12376
diff
changeset
|
725 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
|
726 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
727 $ hg init repo |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
728 $ hg init repo/s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
729 $ echo a > repo/s/a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
730 $ hg -R repo/s ci -Am0 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
731 adding a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
732 $ echo s = s > repo/.hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
733 $ hg -R repo ci -Am1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
734 adding .hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
735 $ hg clone repo repo2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
736 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
|
737 cloning subrepo s from $TESTTMP/repo/s |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
738 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
|
739 $ hg -q -R repo2 pull -u |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
740 $ echo 1 > repo2/s/a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
741 $ hg -R repo2/s ci -m2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
742 $ hg -q -R repo2/s push |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
743 $ hg -R repo2/s up -C 0 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
744 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
|
745 $ 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
|
746 $ 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
|
747 adding b |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
748 created new head |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
749 $ hg -R repo2 ci -m3 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
750 $ hg -q -R repo2 push |
18109
9e3910db4e78
subrepo: append subrepo path to subrepo error messages
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
17938
diff
changeset
|
751 abort: push creates new remote head cc505f09a8b2! (in subrepo s) |
19934
bfc6ed892349
push: hide description about "-f" in the hint to prevent from using it easily
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19811
diff
changeset
|
752 (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
|
753 [255] |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
754 $ hg -R repo update |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
755 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
|
756 |
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
757 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
|
758 |
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
759 $ 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
|
760 $ hg -R repo2 push -f -q |
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
761 $ hg -R repo update |
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
762 b: untracked file differs |
18109
9e3910db4e78
subrepo: append subrepo path to subrepo error messages
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
17938
diff
changeset
|
763 abort: untracked files in working directory differ from files in requested revision (in subrepo s) |
17895
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
764 [255] |
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
765 |
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
766 $ cat repo/s/b |
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
767 issue3276_ok |
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
768 $ rm repo/s/b |
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
769 $ hg -R repo revert --all |
17907
ce2c709a8e90
test-subrepo: adapt for Windows after 17c030014ddf
Adrian Buehlmann <adrian@cadifra.com>
parents:
17895
diff
changeset
|
770 reverting repo/.hgsubstate (glob) |
17895
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
771 reverting subrepo s |
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
772 $ hg -R repo update |
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
773 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
|
774 $ cat repo/s/b |
17c030014ddf
subrepo: only do clean update when overwrite is set (issue3276)
Simon Heimberg <simohe@besonet.ch>
parents:
17345
diff
changeset
|
775 2 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
776 $ 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
|
777 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
778 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
779 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
|
780 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
781 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
|
782 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
783 $ hg init issue1852a |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
784 $ cd issue1852a |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
785 $ hg init sub/repo |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
786 $ 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
|
787 $ 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
|
788 $ 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
|
789 $ hg add .hgsub |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
790 $ hg ci -mtest |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
791 committing subrepository sub/repo (glob) |
12753
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
792 $ 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
|
793 $ hg ci -mtest |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
794 committing subrepository sub/repo (glob) |
21041
a2cc3c08c3ac
cat: support cat with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
21024
diff
changeset
|
795 $ hg cat sub/repo/foo |
a2cc3c08c3ac
cat: support cat with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
21024
diff
changeset
|
796 test |
a2cc3c08c3ac
cat: support cat with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
21024
diff
changeset
|
797 test |
a2cc3c08c3ac
cat: support cat with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
21024
diff
changeset
|
798 $ mkdir -p tmp/sub/repo |
a2cc3c08c3ac
cat: support cat with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
21024
diff
changeset
|
799 $ 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
|
800 $ 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
|
801 test |
a2cc3c08c3ac
cat: support cat with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
21024
diff
changeset
|
802 $ mv sub/repo sub_ |
a2cc3c08c3ac
cat: support cat with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
21024
diff
changeset
|
803 $ hg cat sub/repo/baz |
a2cc3c08c3ac
cat: support cat with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
21024
diff
changeset
|
804 skipping missing subrepository: sub/repo |
a2cc3c08c3ac
cat: support cat with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
21024
diff
changeset
|
805 [1] |
a2cc3c08c3ac
cat: support cat with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
21024
diff
changeset
|
806 $ rm -rf sub/repo |
a2cc3c08c3ac
cat: support cat with explicit paths in subrepos
Matt Harbison <matt_harbison@yahoo.com>
parents:
21024
diff
changeset
|
807 $ 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
|
808 $ cd .. |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
809 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
810 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
|
811 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
812 $ hg init issue1852b |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
813 $ 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
|
814 pulling from issue1852a |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
815 requesting all changes |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
816 adding changesets |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
817 adding manifests |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
818 adding file changes |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
819 added 2 changesets with 3 changes to 2 files |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
820 (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
|
821 $ hg -R issue1852b update |
18109
9e3910db4e78
subrepo: append subrepo path to subrepo error messages
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
17938
diff
changeset
|
822 abort: default path for subrepository not found (in subrepo sub/repo) (glob) |
12753
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
823 [255] |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
824 |
18965
0062508b1900
ui: add support for fully printing chained exception stacks in ui.traceback()
Matt Harbison <matt_harbison@yahoo.com>
parents:
18943
diff
changeset
|
825 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
|
826 |
0062508b1900
ui: add support for fully printing chained exception stacks in ui.traceback()
Matt Harbison <matt_harbison@yahoo.com>
parents:
18943
diff
changeset
|
827 $ hg -R issue1852b update --traceback 2>&1 | grep 'raise util\.Abort' |
0062508b1900
ui: add support for fully printing chained exception stacks in ui.traceback()
Matt Harbison <matt_harbison@yahoo.com>
parents:
18943
diff
changeset
|
828 raise util.Abort(_("default path for subrepository not found")) |
0062508b1900
ui: add support for fully printing chained exception stacks in ui.traceback()
Matt Harbison <matt_harbison@yahoo.com>
parents:
18943
diff
changeset
|
829 |
12753
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
830 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
|
831 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
832 $ 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
|
833 pulling from issue1852a |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
834 searching for changes |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
835 no changes found |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
836 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
837 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
|
838 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
839 $ hg init issue1852c |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
840 $ 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
|
841 pulling from issue1852a |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
842 adding changesets |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
843 adding manifests |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
844 adding file changes |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
845 added 1 changesets with 2 changes to 2 files |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
846 cloning subrepo sub/repo from issue1852a/sub/repo (glob) |
12852
5dbff89cf107
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
847 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
|
848 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
849 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
|
850 |
12852
5dbff89cf107
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
851 $ hg -R issue1852a push `pwd`/issue1852c |
19218
475a4b13263f
tests: backport some glob fixups
Matt Mackall <mpm@selenic.com>
parents:
19165
diff
changeset
|
852 pushing to $TESTTMP/issue1852c (glob) |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16540
diff
changeset
|
853 pushing subrepo sub/repo to $TESTTMP/issue1852c/sub/repo (glob) |
12852
5dbff89cf107
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
854 searching for changes |
5dbff89cf107
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
855 no changes found |
5dbff89cf107
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
856 searching for changes |
5dbff89cf107
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
857 adding changesets |
5dbff89cf107
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
858 adding manifests |
5dbff89cf107
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
859 adding file changes |
5dbff89cf107
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
860 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
|
861 |
14360
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
862 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
|
863 |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
864 $ hg clone -q issue1852a issue1852d |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
865 $ hg -R issue1852d outgoing --subrepos issue1852c |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
866 comparing with issue1852c |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
867 searching for changes |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
868 no changes found |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
869 comparing with issue1852c/sub/repo |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
870 searching for changes |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
871 no changes found |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
872 [1] |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
873 $ hg -R issue1852d incoming --subrepos issue1852c |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
874 comparing with issue1852c |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
875 searching for changes |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
876 no changes found |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
877 comparing with issue1852c/sub/repo |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
878 searching for changes |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
879 no changes found |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
880 [1] |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
881 |
13233
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
882 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
|
883 subrepository: |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
884 |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
885 $ 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
|
886 $ cd subrepo-status |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
887 $ 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
|
888 $ 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
|
889 $ cd subrepo-2 |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
890 $ touch file |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
891 $ hg add file |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
892 $ cd .. |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
893 $ 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
|
894 $ 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
|
895 $ hg add .hgsub |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
896 $ 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
|
897 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
|
898 $ 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
|
899 |
17938
fd903f89e42b
share: always set default path to work with subrepos (issue3518)
simon@laptop-tosh
parents:
17907
diff
changeset
|
900 Check that share works with subrepo |
fd903f89e42b
share: always set default path to work with subrepos (issue3518)
simon@laptop-tosh
parents:
17907
diff
changeset
|
901 $ hg --config extensions.share= share . ../shared |
fd903f89e42b
share: always set default path to work with subrepos (issue3518)
simon@laptop-tosh
parents:
17907
diff
changeset
|
902 updating working directory |
fd903f89e42b
share: always set default path to work with subrepos (issue3518)
simon@laptop-tosh
parents:
17907
diff
changeset
|
903 cloning subrepo subrepo-2 from $TESTTMP/subrepo-status/subrepo-2 |
fd903f89e42b
share: always set default path to work with subrepos (issue3518)
simon@laptop-tosh
parents:
17907
diff
changeset
|
904 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
fd903f89e42b
share: always set default path to work with subrepos (issue3518)
simon@laptop-tosh
parents:
17907
diff
changeset
|
905 $ test -f ../shared/subrepo-1/.hg/sharedpath |
fd903f89e42b
share: always set default path to work with subrepos (issue3518)
simon@laptop-tosh
parents:
17907
diff
changeset
|
906 [1] |
18510
f254ab6207ae
subrepo: use sharepath if available when locating the source repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
18109
diff
changeset
|
907 $ hg -R ../shared in |
18511
798ab869b2ee
share: backout fd903f89e42b, except the test
Matt Harbison <matt_harbison@yahoo.com>
parents:
18510
diff
changeset
|
908 abort: repository default not found! |
798ab869b2ee
share: backout fd903f89e42b, except the test
Matt Harbison <matt_harbison@yahoo.com>
parents:
18510
diff
changeset
|
909 [255] |
18510
f254ab6207ae
subrepo: use sharepath if available when locating the source repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
18109
diff
changeset
|
910 $ 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
|
911 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
|
912 $ 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
|
913 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
|
914 branch: default |
f254ab6207ae
subrepo: use sharepath if available when locating the source repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
18109
diff
changeset
|
915 commit: (clean) |
f254ab6207ae
subrepo: use sharepath if available when locating the source repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
18109
diff
changeset
|
916 update: (current) |
f254ab6207ae
subrepo: use sharepath if available when locating the source repo
Matt Harbison <matt_harbison@yahoo.com>
parents:
18109
diff
changeset
|
917 remote: (synced) |
17938
fd903f89e42b
share: always set default path to work with subrepos (issue3518)
simon@laptop-tosh
parents:
17907
diff
changeset
|
918 |
13322
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
919 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
|
920 $ 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
|
921 $ 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
|
922 $ 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
|
923 C .hgsub |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
924 C .hgsubstate |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
925 C a |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
926 C s/.hgsub |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
927 C s/.hgsubstate |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
928 C s/a |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
929 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
|
930 C t/t |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
931 $ 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
|
932 $ cd s |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
933 $ echo c1 > b |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
934 $ echo c1 > c |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
935 $ hg add b |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
936 $ cd .. |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
937 $ hg status -S |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
938 M s/a |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
939 A s/b |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
940 ? s/c |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
941 $ hg update -C |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
942 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
943 $ hg status -S |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
944 ? s/b |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
945 ? s/c |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
946 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
947 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
|
948 $ cd $TESTTMP/t |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
949 $ hg id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
950 925c17564ef8 tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
951 $ hg -R s id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
952 12a213df6fa9 tip |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17255
diff
changeset
|
953 $ hg -R t id |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
954 52c0adc0515a tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
955 $ hg update 11 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
956 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
|
957 $ hg id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
958 365661e5936a |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
959 $ hg -R s id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
960 fc627a69481f |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17255
diff
changeset
|
961 $ hg -R t id |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
962 e95bcfa18a35 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
963 |
21024
7731a2281cf0
spelling: fixes from spell checker
Mads Kiilerich <madski@unity3d.com>
parents:
20827
diff
changeset
|
964 Sticky subrepositories, file changes |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
965 $ touch s/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
966 $ touch t/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
967 $ hg add -S s/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
968 $ hg add -S t/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
969 $ hg id |
17255
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
970 365661e5936a+ |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
971 $ hg -R s id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
972 fc627a69481f+ |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17255
diff
changeset
|
973 $ hg -R t id |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
974 e95bcfa18a35+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
975 $ 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
|
976 subrepository s diverged (local revision: fc627a69481f, remote revision: 12a213df6fa9) |
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
|
977 (M)erge, keep (l)ocal or keep (r)emote? m |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
978 subrepository sources for s differ |
22590
d4c972b97fee
subrepo: remove superfluous newline from subrepo prompt
Mads Kiilerich <madski@unity3d.com>
parents:
21897
diff
changeset
|
979 use (l)ocal source (fc627a69481f) or (r)emote source (12a213df6fa9)? 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
|
980 subrepository t diverged (local revision: e95bcfa18a35, remote revision: 52c0adc0515a) |
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
|
981 (M)erge, keep (l)ocal or keep (r)emote? m |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
982 subrepository sources for t differ |
22590
d4c972b97fee
subrepo: remove superfluous newline from subrepo prompt
Mads Kiilerich <madski@unity3d.com>
parents:
21897
diff
changeset
|
983 use (l)ocal source (e95bcfa18a35) or (r)emote source (52c0adc0515a)? l |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
984 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
|
985 $ hg id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
986 925c17564ef8+ tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
987 $ hg -R s id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
988 fc627a69481f+ |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17255
diff
changeset
|
989 $ hg -R t id |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
990 e95bcfa18a35+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
991 $ hg update --clean tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
992 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
|
993 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
994 Sticky subrepository, revision updates |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
995 $ hg id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
996 925c17564ef8 tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
997 $ hg -R s id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
998 12a213df6fa9 tip |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17255
diff
changeset
|
999 $ hg -R t id |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1000 52c0adc0515a tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1001 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1002 $ hg update -r -2 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1003 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
|
1004 $ cd ../t |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1005 $ hg update -r 2 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1006 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
|
1007 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1008 $ 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
|
1009 subrepository s diverged (local revision: 12a213df6fa9, remote revision: fc627a69481f) |
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
|
1010 (M)erge, keep (l)ocal or keep (r)emote? m |
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
|
1011 subrepository t diverged (local revision: 52c0adc0515a, remote revision: 20a0db6fbf6c) |
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
|
1012 (M)erge, keep (l)ocal or keep (r)emote? m |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1013 subrepository sources for t differ (in checked out version) |
22590
d4c972b97fee
subrepo: remove superfluous newline from subrepo prompt
Mads Kiilerich <madski@unity3d.com>
parents:
21897
diff
changeset
|
1014 use (l)ocal source (7af322bc1198) or (r)emote source (20a0db6fbf6c)? l |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1015 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
|
1016 $ hg id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1017 e45c8b14af55+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1018 $ hg -R s id |
17255
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
1019 02dcf1d70411 |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17255
diff
changeset
|
1020 $ hg -R t id |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1021 7af322bc1198 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1022 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1023 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
|
1024 $ touch s/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1025 $ touch t/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1026 $ hg add -S s/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1027 $ hg add -S t/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1028 $ hg id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1029 e45c8b14af55+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1030 $ hg -R s id |
17255
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
1031 02dcf1d70411+ |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17255
diff
changeset
|
1032 $ hg -R t id |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1033 7af322bc1198+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1034 $ 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
|
1035 subrepository s diverged (local revision: 12a213df6fa9, remote revision: 12a213df6fa9) |
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
|
1036 (M)erge, keep (l)ocal or keep (r)emote? m |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1037 subrepository sources for s differ |
22590
d4c972b97fee
subrepo: remove superfluous newline from subrepo prompt
Mads Kiilerich <madski@unity3d.com>
parents:
21897
diff
changeset
|
1038 use (l)ocal source (02dcf1d70411) or (r)emote source (12a213df6fa9)? 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
|
1039 subrepository t diverged (local revision: 52c0adc0515a, remote revision: 52c0adc0515a) |
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
|
1040 (M)erge, keep (l)ocal or keep (r)emote? m |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1041 subrepository sources for t differ |
22590
d4c972b97fee
subrepo: remove superfluous newline from subrepo prompt
Mads Kiilerich <madski@unity3d.com>
parents:
21897
diff
changeset
|
1042 use (l)ocal source (7af322bc1198) or (r)emote source (52c0adc0515a)? l |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1043 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
|
1044 $ hg id |
17255
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
1045 925c17564ef8+ tip |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1046 $ hg -R s id |
17255
3e856d8abe9c
identity: show trailing '+' for dirty subrepos (issue2839)
Patrick Mezard <patrick@mezard.eu>
parents:
16912
diff
changeset
|
1047 02dcf1d70411+ |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17255
diff
changeset
|
1048 $ hg -R t id |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1049 7af322bc1198+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1050 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1051 Sticky repository, update --clean |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1052 $ hg update --clean tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1053 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
|
1054 $ hg id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1055 925c17564ef8 tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1056 $ hg -R s id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1057 12a213df6fa9 tip |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17255
diff
changeset
|
1058 $ hg -R t id |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1059 52c0adc0515a tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1060 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1061 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
|
1062 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1063 $ hg update fc627a69481f |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1064 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
|
1065 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1066 $ 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
|
1067 subrepository s diverged (local revision: 12a213df6fa9, remote revision: fc627a69481f) |
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
|
1068 (M)erge, keep (l)ocal or keep (r)emote? m |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1069 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
|
1070 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
|
1071 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1072 11+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1073 $ hg -R s id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1074 fc627a69481f |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17255
diff
changeset
|
1075 $ hg -R t id |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
1076 e95bcfa18a35 |
14536
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1077 |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1078 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
|
1079 |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1080 $ 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
|
1081 $ hg ci -mrm |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
16039
diff
changeset
|
1082 nothing changed |
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
16039
diff
changeset
|
1083 [1] |
14536
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1084 $ hg log -vr tip |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
16039
diff
changeset
|
1085 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
|
1086 tag: tip |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1087 user: test |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1088 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
|
1089 files: .hgsubstate |
14536
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1090 description: |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
16039
diff
changeset
|
1091 13 |
14536
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1092 |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1093 |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1094 |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1095 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
|
1096 |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1097 $ hg rm .hgsub |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1098 $ hg ci -mrm2 |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
16039
diff
changeset
|
1099 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
|
1100 $ hg log -vr tip |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
16039
diff
changeset
|
1101 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
|
1102 tag: tip |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
16039
diff
changeset
|
1103 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
|
1104 user: test |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1105 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
|
1106 files: .hgsub .hgsubstate |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1107 description: |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1108 rm2 |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1109 |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
1110 |
15635
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
1111 Test issue3153: diff -S with deleted subrepos |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
1112 |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
1113 $ 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
|
1114 diff -r 365661e5936a -r 2400bccd50af .hgsub |
15635
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
1115 --- a/.hgsub |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
1116 +++ /dev/null |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
1117 @@ -1,2 +0,0 @@ |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
1118 -s = s |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
1119 -t = t |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
16039
diff
changeset
|
1120 diff -r 365661e5936a -r 2400bccd50af .hgsubstate |
15635
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
1121 --- a/.hgsubstate |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
1122 +++ /dev/null |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
1123 @@ -1,2 +0,0 @@ |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
1124 -fc627a69481fcbe5f1135069e8a3881c023e4cf5 s |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
1125 -e95bcfa18a358dc4936da981ebf4147b4cad1362 t |
15636 | 1126 |
15409
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1127 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
|
1128 $ 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
|
1129 $ 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
|
1130 $ cd explicit |
15409
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1131 $ 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
|
1132 $ hg add .hgsub |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1133 $ hg init s |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1134 $ hg ci -m0 |
15410
9e99d2bbb1b1
add: support adding explicit files in subrepos
David M. Carr <david@carrclan.us>
parents:
15409
diff
changeset
|
1135 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
|
1136 $ echo c1 > f1 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1137 $ 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
|
1138 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1139 ? f1 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1140 ? s/f2 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1141 $ 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
|
1142 $ hg st -S |
15410
9e99d2bbb1b1
add: support adding explicit files in subrepos
David M. Carr <david@carrclan.us>
parents:
15409
diff
changeset
|
1143 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
|
1144 ? f1 |
15410
9e99d2bbb1b1
add: support adding explicit files in subrepos
David M. Carr <david@carrclan.us>
parents:
15409
diff
changeset
|
1145 $ 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
|
1146 $ hg ci -Am1 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1147 adding f1 |
15410
9e99d2bbb1b1
add: support adding explicit files in subrepos
David M. Carr <david@carrclan.us>
parents:
15409
diff
changeset
|
1148 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
|
1149 $ echo c3 > f3 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1150 $ 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
|
1151 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1152 ? f3 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1153 ? s/f4 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1154 $ 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
|
1155 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1156 A s/f4 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1157 ? f3 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1158 $ 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
|
1159 $ hg ci -Ama2 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1160 adding f3 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1161 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
|
1162 $ echo c5 > f5 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1163 $ 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
|
1164 $ 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
|
1165 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1166 ? f5 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1167 ? s/f6 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1168 ? s/f7 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1169 $ hg add |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1170 adding f5 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1171 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1172 A f5 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1173 ? s/f6 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1174 ? s/f7 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1175 $ 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
|
1176 adding f6 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1177 adding f7 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1178 $ hg ci -m3 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1179 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
|
1180 $ echo c8 > f8 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1181 $ 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
|
1182 $ 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
|
1183 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1184 ? f8 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1185 ? s/f10 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1186 ? s/f9 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1187 $ hg add -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1188 adding f8 |
15520
d6d7b56ec346
tests: add missing '(glob)'s to match '\' in paths in test output on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
15474
diff
changeset
|
1189 adding s/f10 (glob) |
d6d7b56ec346
tests: add missing '(glob)'s to match '\' in paths in test output on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
15474
diff
changeset
|
1190 adding s/f9 (glob) |
15409
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1191 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1192 A f8 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1193 A s/f10 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1194 A s/f9 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1195 $ 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
|
1196 $ hg ci -m4 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1197 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
|
1198 $ echo c11 > fm11 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1199 $ echo c12 > fn12 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1200 $ 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
|
1201 $ 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
|
1202 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1203 ? fm11 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1204 ? fn12 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1205 ? s/fm13 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1206 ? s/fn14 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1207 $ 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
|
1208 adding fm11 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1209 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1210 A fm11 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1211 ? fn12 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1212 ? s/fm13 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1213 ? s/fn14 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1214 $ 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
|
1215 adding fm13 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1216 adding fn14 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1217 $ hg ci -Am5 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1218 adding fn12 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1219 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
|
1220 $ echo c15 > fm15 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1221 $ echo c16 > fn16 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1222 $ 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
|
1223 $ 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
|
1224 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1225 ? fm15 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1226 ? fn16 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1227 ? s/fm17 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1228 ? s/fn18 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1229 $ 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
|
1230 adding fm15 |
15520
d6d7b56ec346
tests: add missing '(glob)'s to match '\' in paths in test output on windows
Mads Kiilerich <mads@kiilerich.com>
parents:
15474
diff
changeset
|
1231 adding s/fm17 (glob) |
15409
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1232 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1233 A fm15 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1234 A s/fm17 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1235 ? fn16 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1236 ? s/fn18 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1237 $ 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
|
1238 adding fn18 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1239 $ hg ci -Am6 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1240 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
|
1241 |
d90b0b30464b
tests: add test for behavior of forget for explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15447
diff
changeset
|
1242 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
|
1243 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
|
1244 $ 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
|
1245 $ 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
|
1246 $ 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
|
1247 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
|
1248 $ hg forget s/f19 |
15474
95174c381525
forget: support forgetting explicit paths in subrepos
David M. Carr <david@carrclan.us>
parents:
15473
diff
changeset
|
1249 $ hg st -S |
95174c381525
forget: support forgetting explicit paths in subrepos
David M. Carr <david@carrclan.us>
parents:
15473
diff
changeset
|
1250 ? 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
|
1251 $ 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
|
1252 $ cd .. |
18520
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1253 |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1254 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
|
1255 (issue3781) |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1256 |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1257 $ cp -r main issue3781 |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1258 $ cp -r main issue3781-dest |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1259 $ 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
|
1260 $ 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
|
1261 5: draft |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1262 $ 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
|
1263 $ cd ../../issue3781 |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1264 $ 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
|
1265 > [paths] |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1266 > default=../issue3781-dest/ |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1267 > EOF |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1268 $ hg push |
18555
b31e0be96c79
tests: fix windows test failure in test-subrepo.t
Mads Kiilerich <madski@unity3d.com>
parents:
18520
diff
changeset
|
1269 pushing to $TESTTMP/issue3781-dest (glob) |
18520
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1270 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
|
1271 searching for changes |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1272 no changes found |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1273 searching for changes |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1274 no changes found |
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1275 [1] |
20176
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1276 $ cd .. |
18520
751135cca13c
subrepo: allows to drop courtesy phase sync (issue3781)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
18511
diff
changeset
|
1277 |
20176
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1278 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
|
1279 configuration |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1280 |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1281 $ cd t |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1282 $ 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
|
1283 |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1284 $ 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
|
1285 > [phases] |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1286 > 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
|
1287 > EOF |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1288 $ 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
|
1289 > [phases] |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1290 > 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
|
1291 > EOF |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1292 $ 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
|
1293 $ 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
|
1294 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
|
1295 transaction abort! |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1296 rollback completed |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1297 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
|
1298 [255] |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1299 $ 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
|
1300 $ 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
|
1301 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
|
1302 $ 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
|
1303 3: secret |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1304 $ 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
|
1305 6: draft |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1306 $ 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
|
1307 $ 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
|
1308 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
|
1309 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
|
1310 $ 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
|
1311 4: secret |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1312 $ 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
|
1313 7: secret |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1314 |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1315 $ 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
|
1316 > [phases] |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1317 > 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
|
1318 > EOF |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1319 $ 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
|
1320 > [phases] |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1321 > 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
|
1322 > EOF |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1323 $ 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
|
1324 $ 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
|
1325 $ 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
|
1326 committing subrepository s |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1327 committing subrepository s/ss |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1328 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
|
1329 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
|
1330 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
|
1331 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
|
1332 $ 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
|
1333 5: secret |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1334 $ 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
|
1335 8: secret |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1336 $ 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
|
1337 6: draft |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1338 $ 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
|
1339 15: secret |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1340 |
4c96c50ef937
subrepo: check phase of state in each subrepositories before committing
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
19934
diff
changeset
|
1341 $ cd .. |
20772
03774a2b6991
commit: propagate --secret option to subrepos (issue4182)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20276
diff
changeset
|
1342 |
03774a2b6991
commit: propagate --secret option to subrepos (issue4182)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20276
diff
changeset
|
1343 |
21024
7731a2281cf0
spelling: fixes from spell checker
Mads Kiilerich <madski@unity3d.com>
parents:
20827
diff
changeset
|
1344 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
|
1345 |
03774a2b6991
commit: propagate --secret option to subrepos (issue4182)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20276
diff
changeset
|
1346 $ cd main |
03774a2b6991
commit: propagate --secret option to subrepos (issue4182)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20276
diff
changeset
|
1347 $ echo secret >> b |
03774a2b6991
commit: propagate --secret option to subrepos (issue4182)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20276
diff
changeset
|
1348 $ echo secret >> s/b |
03774a2b6991
commit: propagate --secret option to subrepos (issue4182)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20276
diff
changeset
|
1349 $ 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
|
1350 committing subrepository s |
03774a2b6991
commit: propagate --secret option to subrepos (issue4182)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20276
diff
changeset
|
1351 $ hg phase -r . |
03774a2b6991
commit: propagate --secret option to subrepos (issue4182)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20276
diff
changeset
|
1352 6: secret |
03774a2b6991
commit: propagate --secret option to subrepos (issue4182)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20276
diff
changeset
|
1353 $ cd s |
03774a2b6991
commit: propagate --secret option to subrepos (issue4182)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20276
diff
changeset
|
1354 $ hg phase -r . |
03774a2b6991
commit: propagate --secret option to subrepos (issue4182)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20276
diff
changeset
|
1355 6: secret |
03774a2b6991
commit: propagate --secret option to subrepos (issue4182)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
20276
diff
changeset
|
1356 $ 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
|
1357 |
21897
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1358 Test "subrepos" template keyword |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1359 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1360 $ cd t |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1361 $ hg update -q 15 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1362 $ cat > .hgsub <<EOF |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1363 > s = s |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1364 > EOF |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1365 $ hg commit -m "16" |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1366 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
|
1367 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1368 (addition of ".hgsub" itself) |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1369 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1370 $ 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
|
1371 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
|
1372 --- /dev/null |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1373 +++ b/.hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1374 @@ -0,0 +1,1 @@ |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1375 +e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1376 $ 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
|
1377 f7b1eb17ad24 000000000000 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1378 s |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1379 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1380 (modification of existing entry) |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1381 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1382 $ 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
|
1383 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
|
1384 --- a/.hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1385 +++ b/.hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1386 @@ -1,1 +1,1 @@ |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1387 -e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1388 +dc73e2e6d2675eb2e41e33c205f4bdab4ea5111d s |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1389 $ 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
|
1390 7cf8cfea66e4 000000000000 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1391 s |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1392 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1393 (addition of entry) |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1394 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1395 $ 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
|
1396 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
|
1397 --- a/.hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1398 +++ b/.hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1399 @@ -1,1 +1,2 @@ |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1400 e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1401 +60ca1237c19474e7a3978b0dc1ca4e6f36d51382 t |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1402 $ 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
|
1403 7cf8cfea66e4 000000000000 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1404 t |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1405 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1406 (removal of existing entry) |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1407 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1408 $ 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
|
1409 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
|
1410 --- a/.hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1411 +++ b/.hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1412 @@ -1,2 +1,1 @@ |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1413 0731af8ca9423976d3743119d0865097c07bdc1b s |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1414 -e202dc79b04c88a636ea8913d9182a1346d9b3dc t |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1415 $ 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
|
1416 8bec38d2bd0b 000000000000 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1417 t |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1418 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1419 (merging) |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1420 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1421 $ 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
|
1422 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
|
1423 --- a/.hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1424 +++ b/.hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1425 @@ -1,1 +1,2 @@ |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1426 fc627a69481fcbe5f1135069e8a3881c023e4cf5 s |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1427 +60ca1237c19474e7a3978b0dc1ca4e6f36d51382 t |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1428 $ 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
|
1429 f6affe3fbfaa 1f14a2e2d3ec |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1430 t |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1431 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1432 (removal of ".hgsub" itself) |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1433 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1434 $ 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
|
1435 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
|
1436 --- a/.hgsubstate |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1437 +++ /dev/null |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1438 @@ -1,2 +0,0 @@ |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1439 -e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1440 -7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4 t |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1441 $ 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
|
1442 f94576341bcf 000000000000 |
764adc332f6e
templatekw: add 'subrepos' keyword to show updated subrepositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21890
diff
changeset
|
1443 |
21890
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1444 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
|
1445 |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1446 $ 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
|
1447 $ 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
|
1448 > # 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
|
1449 > 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
|
1450 > 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
|
1451 > EOF |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1452 $ 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
|
1453 $ 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
|
1454 $ 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
|
1455 > [paths] |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1456 > 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
|
1457 > EOF |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1458 $ 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
|
1459 $ 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
|
1460 [paths] |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1461 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
|
1462 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
|
1463 $ 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
|
1464 [paths] |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1465 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
|
1466 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
|
1467 $ 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
|
1468 [paths] |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1469 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
|
1470 default-push = /foo/bar/t |
0f916db7f297
subrepo: add test whether "[paths]" is configured correctly at subrepo creation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21693
diff
changeset
|
1471 $ cd .. |