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