Mercurial > hg
annotate tests/test-subrepo.t @ 16698:26756d9d8143
tests: make test-convert-darcs.t happier with darcs 2.8.0
author | Bryan O'Sullivan <bryano@fb.com> |
---|---|
date | Sun, 13 May 2012 11:47:55 +0200 |
parents | 4fe8eb4a6e2c |
children | 6ef3107c661e |
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 $ rm -rf sub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
7 $ mkdir sub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
8 $ cd sub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
9 $ hg init t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
10 $ cd t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
11 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
12 first revision, no sub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
13 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
14 $ echo a > a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
15 $ hg ci -Am0 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
16 adding a |
8816 | 17 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
18 add first sub |
8816 | 19 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
20 $ echo s = s > .hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
21 $ hg add .hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
22 $ hg init s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
23 $ echo a > s/a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
24 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12376
diff
changeset
|
25 Issue2232: committing a subrepo without .hgsub |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
26 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
27 $ hg ci -mbad s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
28 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
|
29 [255] |
8816 | 30 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
31 $ hg -R s ci -Ams0 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
32 adding a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
33 $ hg sum |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
34 parent: 0:f7b1eb17ad24 tip |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
35 0 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
36 branch: default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
37 commit: 1 added, 1 subrepos |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
38 update: (current) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
39 $ hg ci -m1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
40 |
16454
92c7e917b647
tests: add test for fileset 'subrepo' keyword
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
16430
diff
changeset
|
41 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
|
42 |
460135339d74
revert: warn that subrepos cannot be reverted
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
15231
diff
changeset
|
43 $ echo b > s/a |
16454
92c7e917b647
tests: add test for fileset 'subrepo' keyword
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
16430
diff
changeset
|
44 $ 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
|
45 reverting subrepo s |
16540
4fe8eb4a6e2c
tests: add missing accept of native pathname separator
Mads Kiilerich <mads@kiilerich.com>
parents:
16454
diff
changeset
|
46 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
|
47 $ rm s/a.orig |
15265
460135339d74
revert: warn that subrepos cannot be reverted
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
15231
diff
changeset
|
48 |
16430
6883c2363f44
revert: add support for reverting subrepos without --no-backup and/or --all
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
16429
diff
changeset
|
49 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
|
50 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
|
51 |
6883c2363f44
revert: add support for reverting subrepos without --no-backup and/or --all
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
16429
diff
changeset
|
52 $ 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
|
53 $ 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
|
54 reverting subrepo s |
15265
460135339d74
revert: warn that subrepos cannot be reverted
Angel Ezquerra <angel.ezquerra@gmail.com>
parents:
15231
diff
changeset
|
55 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12376
diff
changeset
|
56 Issue2022: update -C |
11485
b602a95c21ec
subrepo: refuse to commit subrepos if .hgsub is excluded (issue2232)
Matt Mackall <mpm@selenic.com>
parents:
11470
diff
changeset
|
57 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
58 $ echo b > s/a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
59 $ hg sum |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
60 parent: 1:7cf8cfea66e4 tip |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
61 1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
62 branch: default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
63 commit: 1 subrepos |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
64 update: (current) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
65 $ hg co -C 1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
66 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
|
67 $ hg sum |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
68 parent: 1:7cf8cfea66e4 tip |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
69 1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
70 branch: default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
71 commit: (clean) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
72 update: (current) |
11485
b602a95c21ec
subrepo: refuse to commit subrepos if .hgsub is excluded (issue2232)
Matt Mackall <mpm@selenic.com>
parents:
11470
diff
changeset
|
73 |
15231
cd6f10dccf16
cmdutil.bailifchanged: abort for dirty subrepos
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
14536
diff
changeset
|
74 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
|
75 |
cd6f10dccf16
cmdutil.bailifchanged: abort for dirty subrepos
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
14536
diff
changeset
|
76 $ echo b >> s/a |
cd6f10dccf16
cmdutil.bailifchanged: abort for dirty subrepos
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
14536
diff
changeset
|
77 $ hg backout tip |
cd6f10dccf16
cmdutil.bailifchanged: abort for dirty subrepos
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
14536
diff
changeset
|
78 abort: uncommitted changes in subrepo s |
cd6f10dccf16
cmdutil.bailifchanged: abort for dirty subrepos
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
14536
diff
changeset
|
79 [255] |
cd6f10dccf16
cmdutil.bailifchanged: abort for dirty subrepos
Eric Roshan Eisner <ede@alum.mit.edu>
parents:
14536
diff
changeset
|
80 $ 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
|
81 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
82 add sub sub |
8816 | 83 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
84 $ echo ss = ss > s/.hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
85 $ hg init s/ss |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
86 $ echo a > s/ss/a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
87 $ hg -R s add s/.hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
88 $ hg -R s/ss add s/ss/a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
89 $ hg sum |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
90 parent: 1:7cf8cfea66e4 tip |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
91 1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
92 branch: default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
93 commit: 1 subrepos |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
94 update: (current) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
95 $ hg ci -m2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
96 committing subrepository s |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
97 committing subrepository s/ss (glob) |
11912
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: 2:df30734270ae tip |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
100 2 |
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: (clean) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
103 update: (current) |
11470
34e33d50c26b
subrepo: correctly handle update -C with modified subrepos (issue2022)
Matt Mackall <mpm@selenic.com>
parents:
11088
diff
changeset
|
104 |
13411
d4de90a612f7
commit: abort if a subrepo is modified and ui.commitsubrepos=no
Patrick Mezard <pmezard@gmail.com>
parents:
13322
diff
changeset
|
105 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
|
106 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
107 $ echo b > s/a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
108 $ 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
|
109 $ hg --config ui.commitsubrepos=no ci -m3 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
110 |
13411
d4de90a612f7
commit: abort if a subrepo is modified and ui.commitsubrepos=no
Patrick Mezard <pmezard@gmail.com>
parents:
13322
diff
changeset
|
111 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
|
112 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
113 $ 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
|
114 $ 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
|
115 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
|
116 (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
|
117 [255] |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
118 $ hg ci -m4 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
119 committing subrepository s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
120 $ hg tip -R s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
121 changeset: 3:1c833a7a9e3a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
122 tag: tip |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
123 user: test |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
124 date: Thu Jan 01 00:00:00 1970 +0000 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
125 summary: 4 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
126 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
127 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
128 check caching |
8816 | 129 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
130 $ hg co 0 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
131 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
|
132 $ hg debugsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
133 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
134 restore |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
135 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
136 $ hg co |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
137 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
|
138 $ hg debugsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
139 path s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
140 source s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
141 revision 1c833a7a9e3a4445c711aaf0f012379cd0d4034e |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
142 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
143 new branch for merge tests |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
144 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
145 $ hg co 1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
146 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
|
147 $ echo t = t >> .hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
148 $ hg init t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
149 $ echo t > t/t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
150 $ hg -R t add t |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
151 adding t/t (glob) |
8816 | 152 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
153 5 |
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 $ hg ci -m5 # add sub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
156 committing subrepository t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
157 created new head |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
158 $ echo t2 > t/t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
159 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
160 6 |
8816 | 161 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
162 $ hg st -R s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
163 $ hg ci -m6 # change sub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
164 committing subrepository t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
165 $ hg debugsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
166 path s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
167 source s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
168 revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
169 path t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
170 source t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
171 revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
172 $ echo t3 > t/t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
173 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
174 7 |
8816 | 175 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
176 $ hg ci -m7 # change sub again for conflict test |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
177 committing subrepository t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
178 $ hg rm .hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
179 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
180 8 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
181 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
182 $ hg ci -m8 # remove sub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
183 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
184 merge tests |
8816 | 185 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
186 $ hg co -C 3 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
187 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
|
188 $ hg merge 5 # test adding |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
189 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
|
190 (branch merge, don't forget to commit) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
191 $ hg debugsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
192 path s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
193 source s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
194 revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
195 path t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
196 source t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
197 revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
198 $ hg ci -m9 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
199 created new head |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
200 $ hg merge 6 --debug # test change |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
201 searching for copies back to rev 2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
202 resolving manifests |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
15623
diff
changeset
|
203 overwrite: False, partial: False |
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
15623
diff
changeset
|
204 ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
205 .hgsubstate: versions differ -> m |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
206 updating: .hgsubstate 1/1 files (100.00%) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
207 subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
208 subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
209 getting subrepo t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
210 resolving manifests |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
15623
diff
changeset
|
211 overwrite: True, partial: False |
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
15623
diff
changeset
|
212 ancestor: 60ca1237c194+, local: 60ca1237c194+, remote: 6747d179aa9a |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
213 t: remote is newer -> g |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
214 updating: t 1/1 files (100.00%) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
215 getting t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
216 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
|
217 (branch merge, don't forget to commit) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
218 $ hg debugsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
219 path s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
220 source s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
221 revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
222 path t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
223 source t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
224 revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
225 $ echo conflict > t/t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
226 $ hg ci -m10 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
227 committing subrepository t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
228 $ HGMERGE=internal:merge hg merge --debug 7 # test conflict |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
229 searching for copies back to rev 2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
230 resolving manifests |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
15623
diff
changeset
|
231 overwrite: False, partial: False |
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
15623
diff
changeset
|
232 ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
233 .hgsubstate: versions differ -> m |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
234 updating: .hgsubstate 1/1 files (100.00%) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
235 subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
236 subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
237 merging subrepo t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
238 searching for copies back to rev 2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
239 resolving manifests |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
15623
diff
changeset
|
240 overwrite: False, partial: False |
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
15623
diff
changeset
|
241 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
242 t: versions differ -> m |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
243 preserving t for resolve of t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
244 updating: t 1/1 files (100.00%) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
245 picked tool 'internal:merge' for t (binary False symlink False) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
246 merging t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
247 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
248 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
|
249 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
|
250 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
|
251 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
252 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
|
253 (branch merge, don't forget to commit) |
8816 | 254 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
255 should conflict |
8816 | 256 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
257 $ cat t/t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
258 <<<<<<< local |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
259 conflict |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
260 ======= |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
261 t3 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
262 >>>>>>> other |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
263 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
264 clone |
8816 | 265 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
266 $ cd .. |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
267 $ hg clone t tc |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
268 updating to branch default |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
269 cloning subrepo s from $TESTTMP/sub/t/s (glob) |
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
270 cloning subrepo s/ss from $TESTTMP/sub/t/s/ss (glob) |
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
271 cloning subrepo t from $TESTTMP/sub/t/t (glob) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
272 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
|
273 $ cd tc |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
274 $ hg debugsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
275 path s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
276 source s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
277 revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
278 path t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
279 source t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
280 revision 20a0db6fbf6c3d2836e6519a642ae929bfc67c0e |
8816 | 281 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
282 push |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
283 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
284 $ echo bah > t/t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
285 $ hg ci -m11 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
286 committing subrepository t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
287 $ hg push |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
288 pushing to $TESTTMP/sub/t (glob) |
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
289 pushing subrepo s/ss to $TESTTMP/sub/t/s/ss (glob) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
290 searching for changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
291 no changes found |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
292 pushing subrepo s to $TESTTMP/sub/t/s (glob) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
293 searching for changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
294 no changes found |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
295 pushing subrepo t to $TESTTMP/sub/t/t (glob) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
296 searching for changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
297 adding changesets |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
298 adding manifests |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
299 adding file changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
300 added 1 changesets with 1 changes to 1 files |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
301 searching for changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
302 adding changesets |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
303 adding manifests |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
304 adding file changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
305 added 1 changesets with 1 changes to 1 files |
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 push -f |
10251
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8816
diff
changeset
|
308 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
309 $ echo bah > s/a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
310 $ hg ci -m12 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
311 committing subrepository s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
312 $ hg push |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
313 pushing to $TESTTMP/sub/t (glob) |
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
314 pushing subrepo s/ss to $TESTTMP/sub/t/s/ss (glob) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
315 searching for changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
316 no changes found |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
317 pushing subrepo s to $TESTTMP/sub/t/s (glob) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
318 searching for changes |
14525
826a13720fbc
prepush: print short hash of first new head in abort message
Adrian Buehlmann <adrian@cadifra.com>
parents:
14361
diff
changeset
|
319 abort: push creates new remote head 12a213df6fa9! |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
320 (did you forget to merge? use push -f to force) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
321 [255] |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
322 $ hg push -f |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
323 pushing to $TESTTMP/sub/t (glob) |
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
324 pushing subrepo s/ss to $TESTTMP/sub/t/s/ss (glob) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
325 searching for changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
326 no changes found |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
327 pushing subrepo s to $TESTTMP/sub/t/s (glob) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
328 searching for changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
329 adding changesets |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
330 adding manifests |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
331 adding file changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
332 added 1 changesets with 1 changes to 1 files (+1 heads) |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
333 pushing subrepo t to $TESTTMP/sub/t/t (glob) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
334 searching for changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
335 no changes found |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
336 searching for changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
337 adding changesets |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
338 adding manifests |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
339 adding file changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
340 added 1 changesets with 1 changes to 1 files |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
341 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
342 update |
10177
5ca0d220ae21
subrepo: add table-based dispatch for subrepo types
Augie Fackler <durin42@gmail.com>
parents:
8816
diff
changeset
|
343 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
344 $ cd ../t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
345 $ hg up -C # discard our earlier merge |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
346 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
|
347 $ echo blah > t/t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
348 $ hg ci -m13 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
349 committing subrepository t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
350 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
351 pull |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
352 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
353 $ cd ../tc |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
354 $ hg pull |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
355 pulling from $TESTTMP/sub/t (glob) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
356 searching for changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
357 adding changesets |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
358 adding manifests |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
359 adding file changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
360 added 1 changesets with 1 changes to 1 files |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
361 (run 'hg update' to get a working copy) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
362 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
363 should pull t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
364 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
365 $ hg up |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
366 pulling subrepo t from $TESTTMP/sub/t/t (glob) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
367 searching for changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
368 adding changesets |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
369 adding manifests |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
370 adding file changes |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
371 added 1 changesets with 1 changes to 1 files |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
372 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
|
373 $ cat t/t |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
374 blah |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
375 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
376 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
|
377 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
378 $ echo 'bogus=[boguspath' >> .hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
379 $ hg ci -m 'bogus subrepo path' |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
380 abort: missing ] in subrepo source |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
381 [255] |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
382 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12376
diff
changeset
|
383 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
|
384 shouldn't need merging |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
385 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
386 # subrepo layout |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
387 # |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
388 # o 5 br |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
389 # /| |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
390 # o | 4 default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
391 # | | |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
392 # | o 3 br |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
393 # |/| |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
394 # o | 2 default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
395 # | | |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
396 # | o 1 br |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
397 # |/ |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
398 # o 0 default |
10251
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8816
diff
changeset
|
399 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
400 $ cd .. |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
401 $ rm -rf sub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
402 $ hg init main |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
403 $ cd main |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
404 $ hg init s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
405 $ cd s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
406 $ echo a > a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
407 $ hg ci -Am1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
408 adding a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
409 $ hg branch br |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
410 marked working directory as branch br |
15615 | 411 (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
|
412 $ echo a >> a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
413 $ hg ci -m1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
414 $ hg up default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
415 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
|
416 $ echo b > b |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
417 $ hg ci -Am1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
418 adding b |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
419 $ hg up br |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
420 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
|
421 $ hg merge tip |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
422 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
|
423 (branch merge, don't forget to commit) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
424 $ hg ci -m1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
425 $ hg up 2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
426 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
|
427 $ echo c > c |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
428 $ hg ci -Am1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
429 adding c |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
430 $ hg up 3 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
431 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
|
432 $ hg merge 4 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
433 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
|
434 (branch merge, don't forget to commit) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
435 $ hg ci -m1 |
10251
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8816
diff
changeset
|
436 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
437 # main repo layout: |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
438 # |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
439 # * <-- try to merge default into br again |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
440 # .`| |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
441 # . o 5 br --> substate = 5 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
442 # . | |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
443 # o | 4 default --> substate = 4 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
444 # | | |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
445 # | o 3 br --> substate = 2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
446 # |/| |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
447 # o | 2 default --> substate = 2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
448 # | | |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
449 # | o 1 br --> substate = 3 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
450 # |/ |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
451 # 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
|
452 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
453 $ cd .. |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
454 $ echo 's = s' > .hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
455 $ hg -R s up 2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
456 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
|
457 $ hg ci -Am1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
458 adding .hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
459 $ hg branch br |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
460 marked working directory as branch br |
15615 | 461 (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
|
462 $ echo b > b |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
463 $ hg -R s up 3 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
464 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
|
465 $ hg ci -Am1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
466 adding b |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
467 $ hg up default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
468 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
|
469 $ echo c > c |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
470 $ hg ci -Am1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
471 adding c |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
472 $ hg up 1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
473 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
|
474 $ hg merge 2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
475 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
|
476 (branch merge, don't forget to commit) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
477 $ hg ci -m1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
478 $ hg up 2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
479 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
|
480 $ hg -R s up 4 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
481 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
|
482 $ echo d > d |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
483 $ hg ci -Am1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
484 adding d |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
485 $ hg up 3 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
486 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
|
487 $ hg -R s up 5 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
488 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
|
489 $ echo e > e |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
490 $ hg ci -Am1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
491 adding e |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
492 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
493 $ hg up 5 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
494 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
|
495 $ hg merge 4 # try to merge default into br again |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
496 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
|
497 (branch merge, don't forget to commit) |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
498 $ cd .. |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
499 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
500 test subrepo delete from .hgsubstate |
10522
b07d487009b2
subrepo: Update .hgsubstate in case of deleted subrepo
Saint Germain <saintger@gmail.com>
parents:
10468
diff
changeset
|
501 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
502 $ hg init testdelete |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
503 $ mkdir testdelete/nested testdelete/nested2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
504 $ hg init testdelete/nested |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
505 $ hg init testdelete/nested2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
506 $ echo test > testdelete/nested/foo |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
507 $ echo test > testdelete/nested2/foo |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
508 $ hg -R testdelete/nested add |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
509 adding testdelete/nested/foo (glob) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
510 $ hg -R testdelete/nested2 add |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
511 adding testdelete/nested2/foo (glob) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
512 $ hg -R testdelete/nested ci -m test |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
513 $ hg -R testdelete/nested2 ci -m test |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
514 $ echo nested = nested > testdelete/.hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
515 $ echo nested2 = nested2 >> testdelete/.hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
516 $ hg -R testdelete add |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
517 adding testdelete/.hgsub (glob) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
518 $ hg -R testdelete ci -m "nested 1 & 2 added" |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
519 $ echo nested = nested > testdelete/.hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
520 $ hg -R testdelete ci -m "nested 2 deleted" |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
521 $ cat testdelete/.hgsubstate |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
522 bdf5c9a3103743d900b12ae0db3ffdcfd7b0d878 nested |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
523 $ hg -R testdelete remove testdelete/.hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
524 $ hg -R testdelete ci -m ".hgsub deleted" |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
525 $ 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
|
526 bdf5c9a3103743d900b12ae0db3ffdcfd7b0d878 nested |
11912
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 test repository cloning |
10251
a19d2993385d
subrepo: fix merging of already merged subrepos (issue1986)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8816
diff
changeset
|
529 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
530 $ mkdir mercurial mercurial2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
531 $ hg init nested_absolute |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
532 $ echo test > nested_absolute/foo |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
533 $ hg -R nested_absolute add |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
534 adding nested_absolute/foo (glob) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
535 $ hg -R nested_absolute ci -mtest |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
536 $ cd mercurial |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
537 $ hg init nested_relative |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
538 $ echo test2 > nested_relative/foo2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
539 $ hg -R nested_relative add |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
540 adding nested_relative/foo2 (glob) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
541 $ hg -R nested_relative ci -mtest2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
542 $ hg init main |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
543 $ echo "nested_relative = ../nested_relative" > main/.hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
544 $ echo "nested_absolute = `pwd`/nested_absolute" >> main/.hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
545 $ hg -R main add |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
546 adding main/.hgsub (glob) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
547 $ hg -R main ci -m "add subrepos" |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
548 $ cd .. |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
549 $ hg clone mercurial/main mercurial2/main |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
550 updating to branch default |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
551 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
|
552 $ cat mercurial2/main/nested_absolute/.hg/hgrc \ |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
553 > mercurial2/main/nested_relative/.hg/hgrc |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
554 [paths] |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12587
diff
changeset
|
555 default = $TESTTMP/sub/mercurial/nested_absolute |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
556 [paths] |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12587
diff
changeset
|
557 default = $TESTTMP/sub/mercurial/nested_relative |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
558 $ rm -rf mercurial mercurial2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
559 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12376
diff
changeset
|
560 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
|
561 |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
562 $ hg init repo |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
563 $ hg init repo/s |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
564 $ echo a > repo/s/a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
565 $ hg -R repo/s ci -Am0 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
566 adding a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
567 $ echo s = s > repo/.hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
568 $ hg -R repo ci -Am1 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
569 adding .hgsub |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
570 $ hg clone repo repo2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
571 updating to branch default |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
572 cloning subrepo s from $TESTTMP/sub/repo/s (glob) |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
573 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
|
574 $ hg -q -R repo2 pull -u |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
575 $ echo 1 > repo2/s/a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
576 $ hg -R repo2/s ci -m2 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
577 $ hg -q -R repo2/s push |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
578 $ hg -R repo2/s up -C 0 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
579 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
|
580 $ echo 2 > repo2/s/a |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
581 $ hg -R repo2/s ci -m3 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
582 created new head |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
583 $ hg -R repo2 ci -m3 |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
584 $ hg -q -R repo2 push |
14525
826a13720fbc
prepush: print short hash of first new head in abort message
Adrian Buehlmann <adrian@cadifra.com>
parents:
14361
diff
changeset
|
585 abort: push creates new remote head 9d66565e64e1! |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
586 (did you forget to merge? use push -f to force) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
587 [255] |
11912
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
588 $ hg -R repo update |
69678985bdba
tests: unify test-subrepo
Martin Geisler <mg@lazybytes.net>
parents:
11485
diff
changeset
|
589 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
|
590 $ 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
|
591 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
592 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
593 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
|
594 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
595 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
|
596 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
597 $ hg init issue1852a |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
598 $ cd issue1852a |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
599 $ hg init sub/repo |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
600 $ 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
|
601 $ 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
|
602 $ 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
|
603 $ hg add .hgsub |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
604 $ hg ci -mtest |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
605 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
|
606 $ 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
|
607 $ hg ci -mtest |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
608 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
|
609 $ cd .. |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
610 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
611 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
|
612 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
613 $ hg init issue1852b |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
614 $ 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
|
615 pulling from issue1852a |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
616 requesting all changes |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
617 adding changesets |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
618 adding manifests |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
619 adding file changes |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
620 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
|
621 (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
|
622 $ hg -R issue1852b update |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
623 abort: default path for subrepository sub/repo not found (glob) |
12753
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
624 [255] |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
625 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
626 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
|
627 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
628 $ 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
|
629 pulling from issue1852a |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
630 searching for changes |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
631 no changes found |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
632 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
633 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
|
634 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
635 $ hg init issue1852c |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
636 $ 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
|
637 pulling from issue1852a |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
638 adding changesets |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
639 adding manifests |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
640 adding file changes |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
641 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
|
642 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
|
643 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
|
644 |
ef5eaf53f4f7
subrepo: abort instead of pushing/pulling to the repo itself
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
645 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
|
646 |
12852
5dbff89cf107
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
647 $ hg -R issue1852a push `pwd`/issue1852c |
5dbff89cf107
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
648 pushing to $TESTTMP/sub/issue1852c |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15410
diff
changeset
|
649 pushing subrepo sub/repo to $TESTTMP/sub/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
|
650 searching for changes |
5dbff89cf107
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
651 no changes found |
5dbff89cf107
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
652 searching for changes |
5dbff89cf107
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
653 adding changesets |
5dbff89cf107
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
654 adding manifests |
5dbff89cf107
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
655 adding file changes |
5dbff89cf107
subrepo: propagate non-default pull/push path to relative subrepos (issue1852)
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
656 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
|
657 |
14360
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
658 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
|
659 |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
660 $ hg clone -q issue1852a issue1852d |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
661 $ hg -R issue1852d outgoing --subrepos issue1852c |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
662 comparing with issue1852c |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
663 searching for changes |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
664 no changes found |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
665 comparing with issue1852c/sub/repo |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
666 searching for changes |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
667 no changes found |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
668 [1] |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
669 $ hg -R issue1852d incoming --subrepos issue1852c |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
670 comparing with issue1852c |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
671 searching for changes |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
672 no changes found |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
673 comparing with issue1852c/sub/repo |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
674 searching for changes |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
675 no changes found |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
676 [1] |
ab687820c4cc
subrepo: respect non-default path for incoming/outgoing
Martin Geisler <mg@aragost.com>
parents:
13417
diff
changeset
|
677 |
13233
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
678 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
|
679 subrepository: |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
680 |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
681 $ 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
|
682 $ cd subrepo-status |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
683 $ 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
|
684 $ 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
|
685 $ cd subrepo-2 |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
686 $ touch file |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
687 $ hg add file |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
688 $ cd .. |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
689 $ 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
|
690 $ 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
|
691 $ hg add .hgsub |
0b30e6148ec5
subrepo: do not report known files inside repositories as unknown
Oleg Stepanov <oleg.stepanov@jetbrains.com>
parents:
12852
diff
changeset
|
692 $ 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
|
693 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
|
694 $ 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
|
695 |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
696 Check hg update --clean |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
697 $ cd $TESTTMP/sub/t |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
698 $ 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
|
699 $ 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
|
700 C .hgsub |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
701 C .hgsubstate |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
702 C a |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
703 C s/.hgsub |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
704 C s/.hgsubstate |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
705 C s/a |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
706 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
|
707 C t/t |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
708 $ 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
|
709 $ cd s |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
710 $ echo c1 > b |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
711 $ echo c1 > c |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
712 $ hg add b |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
713 $ cd .. |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
714 $ hg status -S |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
715 M s/a |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
716 A s/b |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
717 ? s/c |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
718 $ hg update -C |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
719 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
|
720 $ hg status -S |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
721 ? s/b |
c19b9282d3a7
subrepo: make update -C clean the working directory for svn subrepos
Erik Zielke <ez@aragost.com>
parents:
13233
diff
changeset
|
722 ? s/c |
13417
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
723 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
724 Sticky subrepositories, no changes |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
725 $ cd $TESTTMP/sub/t |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
726 $ hg id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
727 925c17564ef8 tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
728 $ hg -R s id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
729 12a213df6fa9 tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
730 $ hg -R t id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
731 52c0adc0515a tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
732 $ hg update 11 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
733 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
|
734 $ hg id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
735 365661e5936a |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
736 $ hg -R s id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
737 fc627a69481f |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
738 $ hg -R t id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
739 e95bcfa18a35 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
740 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
741 Sticky subrepositorys, file changes |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
742 $ touch s/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
743 $ touch t/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
744 $ hg add -S s/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
745 $ hg add -S t/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
746 $ hg id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
747 365661e5936a |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
748 $ hg -R s id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
749 fc627a69481f+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
750 $ hg -R t id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
751 e95bcfa18a35+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
752 $ hg update tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
753 subrepository sources for s differ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
754 use (l)ocal source (fc627a69481f) or (r)emote source (12a213df6fa9)? |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
755 l |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
756 subrepository sources for t differ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
757 use (l)ocal source (e95bcfa18a35) or (r)emote source (52c0adc0515a)? |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
758 l |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
759 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
|
760 $ hg id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
761 925c17564ef8+ tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
762 $ hg -R s id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
763 fc627a69481f+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
764 $ hg -R t id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
765 e95bcfa18a35+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
766 $ hg update --clean tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
767 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
|
768 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
769 Sticky subrepository, revision updates |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
770 $ hg id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
771 925c17564ef8 tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
772 $ hg -R s id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
773 12a213df6fa9 tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
774 $ hg -R t id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
775 52c0adc0515a tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
776 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
777 $ hg update -r -2 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
778 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
|
779 $ cd ../t |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
780 $ hg update -r 2 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
781 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
|
782 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
783 $ hg update 10 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
784 subrepository sources for t differ (in checked out version) |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
785 use (l)ocal source (7af322bc1198) or (r)emote source (20a0db6fbf6c)? |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
786 l |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
787 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
|
788 $ hg id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
789 e45c8b14af55+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
790 $ hg -R s id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
791 1c833a7a9e3a |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
792 $ hg -R t id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
793 7af322bc1198 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
794 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
795 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
|
796 $ touch s/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
797 $ touch t/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
798 $ hg add -S s/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
799 $ hg add -S t/f1 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
800 $ hg id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
801 e45c8b14af55+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
802 $ hg -R s id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
803 1c833a7a9e3a+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
804 $ hg -R t id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
805 7af322bc1198+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
806 $ hg update tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
807 subrepository sources for s differ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
808 use (l)ocal source (1c833a7a9e3a) or (r)emote source (12a213df6fa9)? |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
809 l |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
810 subrepository sources for t differ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
811 use (l)ocal source (7af322bc1198) or (r)emote source (52c0adc0515a)? |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
812 l |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
813 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
|
814 $ hg id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
815 925c17564ef8 tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
816 $ hg -R s id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
817 1c833a7a9e3a+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
818 $ hg -R t id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
819 7af322bc1198+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
820 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
821 Sticky repository, update --clean |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
822 $ hg update --clean tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
823 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
|
824 $ hg id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
825 925c17564ef8 tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
826 $ hg -R s id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
827 12a213df6fa9 tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
828 $ hg -R t id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
829 52c0adc0515a tip |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
830 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
831 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
|
832 $ cd s |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
833 $ hg update fc627a69481f |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
834 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
|
835 $ cd .. |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
836 $ hg update 11 |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
837 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
|
838 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
|
839 $ hg id -n |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
840 11+ |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
841 $ hg -R s id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
842 fc627a69481f |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
843 $ hg -R t id |
0748e18be470
subrepos: prompt on conflicts on update with dirty subrepos
Erik Zielke <ez@aragost.com>
parents:
13411
diff
changeset
|
844 e95bcfa18a35 |
14536
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
845 |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
846 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
|
847 |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
848 $ 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
|
849 $ hg ci -mrm |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
16039
diff
changeset
|
850 nothing changed |
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
16039
diff
changeset
|
851 [1] |
14536
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
852 $ hg log -vr tip |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
16039
diff
changeset
|
853 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
|
854 tag: tip |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
855 user: test |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
856 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
|
857 files: .hgsubstate |
14536
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
858 description: |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
16039
diff
changeset
|
859 13 |
14536
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
860 |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
861 |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
862 |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
863 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
|
864 |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
865 $ hg rm .hgsub |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
866 $ hg ci -mrm2 |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
16039
diff
changeset
|
867 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
|
868 $ hg log -vr tip |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
16039
diff
changeset
|
869 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
|
870 tag: tip |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
16039
diff
changeset
|
871 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
|
872 user: test |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
873 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
|
874 files: .hgsub .hgsubstate |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
875 description: |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
876 rm2 |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
877 |
52cbeb5a651b
subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
Matt Mackall <mpm@selenic.com>
parents:
14525
diff
changeset
|
878 |
15635
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
879 Test issue3153: diff -S with deleted subrepos |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
880 |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
881 $ 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
|
882 diff -r 365661e5936a -r 2400bccd50af .hgsub |
15635
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
883 --- a/.hgsub |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
884 +++ /dev/null |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
885 @@ -1,2 +0,0 @@ |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
886 -s = s |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
887 -t = t |
16073
b254f827b7a6
subrepo: rewrite handling of subrepo state at commit (issue2403)
Matt Mackall <mpm@selenic.com>
parents:
16039
diff
changeset
|
888 diff -r 365661e5936a -r 2400bccd50af .hgsubstate |
15635
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
889 --- a/.hgsubstate |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
890 +++ /dev/null |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
891 @@ -1,2 +0,0 @@ |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
892 -fc627a69481fcbe5f1135069e8a3881c023e4cf5 s |
82f5e471792d
test-subrepo: test for Issue3153
Martin Geisler <mg@lazybytes.net>
parents:
15615
diff
changeset
|
893 -e95bcfa18a358dc4936da981ebf4147b4cad1362 t |
15636 | 894 |
15409
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
895 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
|
896 $ 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
|
897 $ 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
|
898 $ cd explicit |
15409
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
899 $ 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
|
900 $ hg add .hgsub |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
901 $ hg init s |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
902 $ hg ci -m0 |
15410
9e99d2bbb1b1
add: support adding explicit files in subrepos
David M. Carr <david@carrclan.us>
parents:
15409
diff
changeset
|
903 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
|
904 $ echo c1 > f1 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
905 $ 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
|
906 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
907 ? f1 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
908 ? s/f2 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
909 $ 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
|
910 $ hg st -S |
15410
9e99d2bbb1b1
add: support adding explicit files in subrepos
David M. Carr <david@carrclan.us>
parents:
15409
diff
changeset
|
911 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
|
912 ? f1 |
15410
9e99d2bbb1b1
add: support adding explicit files in subrepos
David M. Carr <david@carrclan.us>
parents:
15409
diff
changeset
|
913 $ 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
|
914 $ hg ci -Am1 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
915 adding f1 |
15410
9e99d2bbb1b1
add: support adding explicit files in subrepos
David M. Carr <david@carrclan.us>
parents:
15409
diff
changeset
|
916 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
|
917 $ echo c3 > f3 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
918 $ 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
|
919 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
920 ? f3 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
921 ? s/f4 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
922 $ 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
|
923 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
924 A s/f4 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
925 ? f3 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
926 $ 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
|
927 $ hg ci -Ama2 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
928 adding f3 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
929 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
|
930 $ echo c5 > f5 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
931 $ 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
|
932 $ 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
|
933 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
934 ? f5 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
935 ? s/f6 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
936 ? s/f7 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
937 $ hg add |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
938 adding f5 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
939 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
940 A f5 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
941 ? s/f6 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
942 ? s/f7 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
943 $ 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
|
944 adding f6 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
945 adding f7 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
946 $ hg ci -m3 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
947 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
|
948 $ echo c8 > f8 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
949 $ 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
|
950 $ 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
|
951 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
952 ? f8 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
953 ? s/f10 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
954 ? s/f9 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
955 $ hg add -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
956 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
|
957 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
|
958 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
|
959 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
960 A f8 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
961 A s/f10 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
962 A s/f9 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
963 $ 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
|
964 $ hg ci -m4 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
965 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
|
966 $ echo c11 > fm11 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
967 $ echo c12 > fn12 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
968 $ 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
|
969 $ 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
|
970 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
971 ? fm11 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
972 ? fn12 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
973 ? s/fm13 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
974 ? s/fn14 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
975 $ 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
|
976 adding fm11 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
977 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
978 A fm11 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
979 ? fn12 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
980 ? s/fm13 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
981 ? s/fn14 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
982 $ 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
|
983 adding fm13 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
984 adding fn14 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
985 $ hg ci -Am5 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
986 adding fn12 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
987 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
|
988 $ echo c15 > fm15 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
989 $ echo c16 > fn16 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
990 $ 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
|
991 $ 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
|
992 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
993 ? fm15 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
994 ? fn16 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
995 ? s/fm17 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
996 ? s/fn18 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
997 $ 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
|
998 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
|
999 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
|
1000 $ hg st -S |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1001 A fm15 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1002 A s/fm17 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1003 ? fn16 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1004 ? s/fn18 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1005 $ 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
|
1006 adding fn18 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1007 $ hg ci -Am6 |
83c2e6772408
tests: add test for add of explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15321
diff
changeset
|
1008 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
|
1009 |
d90b0b30464b
tests: add test for behavior of forget for explicit path in subrepo
David M. Carr <david@carrclan.us>
parents:
15447
diff
changeset
|
1010 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
|
1011 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
|
1012 $ 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
|
1013 $ 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
|
1014 $ 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
|
1015 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
|
1016 $ hg forget s/f19 |
15474
95174c381525
forget: support forgetting explicit paths in subrepos
David M. Carr <david@carrclan.us>
parents:
15473
diff
changeset
|
1017 $ hg st -S |
95174c381525
forget: support forgetting explicit paths in subrepos
David M. Carr <david@carrclan.us>
parents:
15473
diff
changeset
|
1018 ? 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
|
1019 $ rm s/f19 |