Mercurial > hg-stable
annotate tests/test-url-rev.t @ 22380:82b2ba904e3e
clone: provide sample username = config entry in .hg/hgrc (issue4359)
Some users clone from a server before ever running 'hg config --edit',
so they don't see our helpful template for things like enabling the
username. Attempt to give them some helpful guidance.
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Tue, 09 Sep 2014 17:16:24 -0400 |
parents | 4cf09a1bf5b2 |
children | 2be7d5ebd4d0 |
rev | line source |
---|---|
12328
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12300
diff
changeset
|
1 Test basic functionality of url#rev syntax |
5222
cbe6e263357b
parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
2 |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
3 $ hg init repo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
4 $ cd repo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
5 $ echo a > a |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
6 $ hg ci -qAm 'add a' |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
7 $ hg branch foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
8 marked working directory as branch foo |
15615 | 9 (branches are permanent and global, did you want a bookmark?) |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
10 $ echo >> a |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
11 $ hg ci -m 'change a' |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
12 $ cd .. |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
13 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
14 $ hg clone 'repo#foo' clone |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
15 adding changesets |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
16 adding manifests |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
17 adding file changes |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
18 added 2 changesets with 2 changes to 1 files |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
19 updating to branch foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
20 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5222
cbe6e263357b
parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
21 |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
22 $ hg --cwd clone heads |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
23 changeset: 1:cd2a86ecc814 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
24 branch: foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
25 tag: tip |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
26 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
27 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
28 summary: change a |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
29 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
30 changeset: 0:1f0dee641bb7 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
31 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
32 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
33 summary: add a |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
34 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
35 $ hg --cwd clone parents |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
36 changeset: 1:cd2a86ecc814 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
37 branch: foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
38 tag: tip |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
39 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
40 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
41 summary: change a |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
42 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
43 $ cat clone/.hg/hgrc |
22380
82b2ba904e3e
clone: provide sample username = config entry in .hg/hgrc (issue4359)
Augie Fackler <raf@durin42.com>
parents:
18997
diff
changeset
|
44 # You may want to set your username here if it is not set |
82b2ba904e3e
clone: provide sample username = config entry in .hg/hgrc (issue4359)
Augie Fackler <raf@durin42.com>
parents:
18997
diff
changeset
|
45 # globally, or this repository requires a different |
82b2ba904e3e
clone: provide sample username = config entry in .hg/hgrc (issue4359)
Augie Fackler <raf@durin42.com>
parents:
18997
diff
changeset
|
46 # username from your usual configuration. If you want to |
82b2ba904e3e
clone: provide sample username = config entry in .hg/hgrc (issue4359)
Augie Fackler <raf@durin42.com>
parents:
18997
diff
changeset
|
47 # set something for all of your repositories on this |
82b2ba904e3e
clone: provide sample username = config entry in .hg/hgrc (issue4359)
Augie Fackler <raf@durin42.com>
parents:
18997
diff
changeset
|
48 # computer, try running the command |
82b2ba904e3e
clone: provide sample username = config entry in .hg/hgrc (issue4359)
Augie Fackler <raf@durin42.com>
parents:
18997
diff
changeset
|
49 # 'hg config --edit --global' |
82b2ba904e3e
clone: provide sample username = config entry in .hg/hgrc (issue4359)
Augie Fackler <raf@durin42.com>
parents:
18997
diff
changeset
|
50 # [ui] |
82b2ba904e3e
clone: provide sample username = config entry in .hg/hgrc (issue4359)
Augie Fackler <raf@durin42.com>
parents:
18997
diff
changeset
|
51 # username = Jane Doe <jdoe@example.com> |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
52 [paths] |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15246
diff
changeset
|
53 default = $TESTTMP/repo#foo (glob) |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
54 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
55 Changing original repo: |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
56 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
57 $ cd repo |
5222
cbe6e263357b
parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
58 |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
59 $ echo >> a |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
60 $ hg ci -m 'new head of branch foo' |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
61 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
62 $ hg up -qC default |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
63 $ echo bar > bar |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
64 $ hg ci -qAm 'add bar' |
5222
cbe6e263357b
parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
65 |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
66 $ hg log |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
67 changeset: 3:4cd725637392 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
68 tag: tip |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
69 parent: 0:1f0dee641bb7 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
70 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
71 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
72 summary: add bar |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
73 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
74 changeset: 2:faba9097cad4 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
75 branch: foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
76 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
77 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
78 summary: new head of branch foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
79 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
80 changeset: 1:cd2a86ecc814 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
81 branch: foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
82 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
83 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
84 summary: change a |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
85 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
86 changeset: 0:1f0dee641bb7 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
87 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
88 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
89 summary: add a |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
90 |
18994
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
91 $ hg -q outgoing '../clone' |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
92 2:faba9097cad4 |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
93 3:4cd725637392 |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
94 $ hg summary --remote --config paths.default='../clone' |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
95 parent: 3:4cd725637392 tip |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
96 add bar |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
97 branch: default |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
98 commit: (clean) |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
99 update: (current) |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
100 remote: 2 outgoing |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
101 $ hg -q outgoing '../clone#foo' |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
102 2:faba9097cad4 |
18994
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
103 $ hg summary --remote --config paths.default='../clone#foo' |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
104 parent: 3:4cd725637392 tip |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
105 add bar |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
106 branch: default |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
107 commit: (clean) |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
108 update: (current) |
32843795e9b3
summary: make "outgoing" information sensitive to branch in URL (issue3829)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
16913
diff
changeset
|
109 remote: 1 outgoing |
5222
cbe6e263357b
parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
110 |
18996
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
111 $ hg -q --cwd ../clone incoming '../repo#foo' |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
112 2:faba9097cad4 |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
113 $ hg --cwd ../clone summary --remote --config paths.default='../repo#foo' |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
114 parent: 1:cd2a86ecc814 tip |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
115 change a |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
116 branch: foo |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
117 commit: (clean) |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
118 update: (current) |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
119 remote: 1 or more incoming |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
120 |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
121 $ hg -q push '../clone#foo' |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
122 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
123 $ hg --cwd ../clone heads |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
124 changeset: 2:faba9097cad4 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
125 branch: foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
126 tag: tip |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
127 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
128 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
129 summary: new head of branch foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
130 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
131 changeset: 0:1f0dee641bb7 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
132 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
133 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
134 summary: add a |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
135 |
18996
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
136 $ hg -q --cwd ../clone incoming '../repo#foo' |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
137 [1] |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
138 $ hg --cwd ../clone summary --remote --config paths.default='../repo#foo' |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
139 parent: 1:cd2a86ecc814 |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
140 change a |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
141 branch: foo |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
142 commit: (clean) |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
143 update: 1 new changesets (update) |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
144 remote: (synced) |
160d8416e286
summary: make "incoming" information sensitive to branch in URL (issue3830)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18994
diff
changeset
|
145 |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
146 $ cd .. |
5222
cbe6e263357b
parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
147 |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
148 $ cd clone |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
149 $ hg rollback |
13446
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
12847
diff
changeset
|
150 repository tip rolled back to revision 1 (undo push) |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
151 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
152 $ hg -q incoming |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
153 2:faba9097cad4 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
154 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
155 $ hg -q pull |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
156 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
157 $ hg heads |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
158 changeset: 2:faba9097cad4 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
159 branch: foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
160 tag: tip |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
161 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
162 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
163 summary: new head of branch foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
164 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
165 changeset: 0:1f0dee641bb7 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
166 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
167 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
168 summary: add a |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
169 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
170 Pull should not have updated: |
5222
cbe6e263357b
parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
171 |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
172 $ hg parents -q |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
173 1:cd2a86ecc814 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
174 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
175 Going back to the default branch: |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
176 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
177 $ hg up -C 0 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
178 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5222
cbe6e263357b
parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
179 |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
180 $ hg parents |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
181 changeset: 0:1f0dee641bb7 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
182 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
183 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
184 summary: add a |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
185 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
186 No new revs, no update: |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
187 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
188 $ hg pull -qu |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
189 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
190 $ hg parents -q |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
191 0:1f0dee641bb7 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
192 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
193 $ hg rollback |
13446
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
12847
diff
changeset
|
194 repository tip rolled back to revision 1 (undo pull) |
5222
cbe6e263357b
parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
195 |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
196 $ hg parents -q |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
197 0:1f0dee641bb7 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
198 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
199 Pull -u takes us back to branch foo: |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
200 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
201 $ hg pull -qu |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
202 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
203 $ hg parents |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
204 changeset: 2:faba9097cad4 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
205 branch: foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
206 tag: tip |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
207 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
208 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
209 summary: new head of branch foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
210 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
211 $ hg rollback |
13446
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
12847
diff
changeset
|
212 repository tip rolled back to revision 1 (undo pull) |
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
12847
diff
changeset
|
213 working directory now based on revision 0 |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
214 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
215 $ hg up -C 0 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
216 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
217 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
218 $ hg parents -q |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
219 0:1f0dee641bb7 |
5224
20817af258d8
pull -u: if "url#rev" was given, update to rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5223
diff
changeset
|
220 |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
221 $ hg heads -q |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
222 1:cd2a86ecc814 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
223 0:1f0dee641bb7 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
224 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
225 $ hg pull -qur default default |
5224
20817af258d8
pull -u: if "url#rev" was given, update to rev
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5223
diff
changeset
|
226 |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
227 $ hg parents |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
228 changeset: 3:4cd725637392 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
229 tag: tip |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
230 parent: 0:1f0dee641bb7 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
231 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
232 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
233 summary: add bar |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
234 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
235 $ hg heads |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
236 changeset: 3:4cd725637392 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
237 tag: tip |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
238 parent: 0:1f0dee641bb7 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
239 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
240 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
241 summary: add bar |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
242 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
243 changeset: 2:faba9097cad4 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
244 branch: foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
245 user: test |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
246 date: Thu Jan 01 00:00:00 1970 +0000 |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
247 summary: new head of branch foo |
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
248 |
15246
7b15dd9125b3
httprepo: make __del__ more stable in error situations
Mads Kiilerich <mads@kiilerich.com>
parents:
15131
diff
changeset
|
249 Test handling of invalid urls |
12300
ca31b0b2ac16
tests: unify test-url-rev
Adrian Buehlmann <adrian@cadifra.com>
parents:
8167
diff
changeset
|
250 |
15246
7b15dd9125b3
httprepo: make __del__ more stable in error situations
Mads Kiilerich <mads@kiilerich.com>
parents:
15131
diff
changeset
|
251 $ hg id http://foo/?bar |
7b15dd9125b3
httprepo: make __del__ more stable in error situations
Mads Kiilerich <mads@kiilerich.com>
parents:
15131
diff
changeset
|
252 abort: unsupported URL component: "bar" |
7b15dd9125b3
httprepo: make __del__ more stable in error situations
Mads Kiilerich <mads@kiilerich.com>
parents:
15131
diff
changeset
|
253 [255] |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16107
diff
changeset
|
254 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16107
diff
changeset
|
255 $ cd .. |
18997
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
256 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
257 Test handling common incoming revisions between "default" and |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
258 "default-push" |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
259 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
260 $ hg -R clone rollback |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
261 repository tip rolled back to revision 1 (undo pull) |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
262 working directory now based on revision 0 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
263 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
264 $ cd repo |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
265 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
266 $ hg update -q -C default |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
267 $ echo modified >> bar |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
268 $ hg commit -m "new head to push current default head" |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
269 $ hg -q push -r ".^1" '../clone' |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
270 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
271 $ hg -q outgoing '../clone' |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
272 2:faba9097cad4 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
273 4:d515801a8f3d |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
274 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
275 $ hg summary --remote --config paths.default='../clone#default' --config paths.default-push='../clone#foo' |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
276 parent: 4:d515801a8f3d tip |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
277 new head to push current default head |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
278 branch: default |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
279 commit: (clean) |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
280 update: (current) |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
281 remote: 1 outgoing |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
282 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
283 $ hg summary --remote --config paths.default='../clone#foo' --config paths.default-push='../clone' |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
284 parent: 4:d515801a8f3d tip |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
285 new head to push current default head |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
286 branch: default |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
287 commit: (clean) |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
288 update: (current) |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
289 remote: 2 outgoing |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
290 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
291 $ hg summary --remote --config paths.default='../clone' --config paths.default-push='../clone#foo' |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
292 parent: 4:d515801a8f3d tip |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
293 new head to push current default head |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
294 branch: default |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
295 commit: (clean) |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
296 update: (current) |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
297 remote: 1 outgoing |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
298 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
299 $ hg clone -q -r 0 . ../another |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
300 $ hg -q outgoing '../another#default' |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
301 3:4cd725637392 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
302 4:d515801a8f3d |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
303 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
304 $ hg summary --remote --config paths.default='../another#default' --config paths.default-push='../clone#default' |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
305 parent: 4:d515801a8f3d tip |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
306 new head to push current default head |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
307 branch: default |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
308 commit: (clean) |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
309 update: (current) |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
310 remote: 1 outgoing |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
311 |
4cf09a1bf5b2
summary: clear "commonincoming" also if branches are different
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18996
diff
changeset
|
312 $ cd .. |