Mercurial > hg

annotate tests/test-pull-update.t @ 36716:bf485b70d0ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
setdiscovery: remove initialsamplesize from a condition It seems more direct to compare the actual sample size. That way we can change the sample taken earlier in the code without breaking the condition. Differential Revision: https://phab.mercurial-scm.org/D2644
author Martin von Zweigbergk <martinvonz@google.com>
date Sun, 04 Mar 2018 07:39:46 -0800
parents 4441705b7111
children eb9835014d20
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
1 $ hg init t
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
2 $ cd t
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
3 $ echo 1 > foo
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
4 $ hg ci -Am m
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
5 adding foo
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
6
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
7 $ cd ..
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
8 $ hg clone t tt
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
9 updating to branch default
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
11 $ cd tt
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
12 $ echo 1.1 > foo
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
13 $ hg ci -Am m
5080
73fdc8bd3ed8 Update on pull -u when heads were closed (fixes issue666).
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
14
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
15 $ cd ../t
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
16 $ echo 1.2 > foo
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
17 $ hg ci -Am m
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
18
31167
696e321b304d update: add experimental config for default way of handling dirty wdir
Martin von Zweigbergk <martinvonz@google.com>
parents: 30332
diff changeset
19 Should respect config to disable dirty update
696e321b304d update: add experimental config for default way of handling dirty wdir
Martin von Zweigbergk <martinvonz@google.com>
parents: 30332
diff changeset
20 $ hg co -qC 0
696e321b304d update: add experimental config for default way of handling dirty wdir
Martin von Zweigbergk <martinvonz@google.com>
parents: 30332
diff changeset
21 $ echo 2 > foo
34705
23ed47a895d5 config: graduate experimental.updatecheck to commands.update.check
Augie Fackler <augie@google.com>
parents: 34661
diff changeset
22 $ hg --config commands.update.check=abort pull -u ../tt
31167
696e321b304d update: add experimental config for default way of handling dirty wdir
Martin von Zweigbergk <martinvonz@google.com>
parents: 30332
diff changeset
23 pulling from ../tt
696e321b304d update: add experimental config for default way of handling dirty wdir
Martin von Zweigbergk <martinvonz@google.com>
parents: 30332
diff changeset
24 searching for changes
696e321b304d update: add experimental config for default way of handling dirty wdir
Martin von Zweigbergk <martinvonz@google.com>
parents: 30332
diff changeset
25 adding changesets
696e321b304d update: add experimental config for default way of handling dirty wdir
Martin von Zweigbergk <martinvonz@google.com>
parents: 30332
diff changeset
26 adding manifests
696e321b304d update: add experimental config for default way of handling dirty wdir
Martin von Zweigbergk <martinvonz@google.com>
parents: 30332
diff changeset
27 adding file changes
696e321b304d update: add experimental config for default way of handling dirty wdir
Martin von Zweigbergk <martinvonz@google.com>
parents: 30332
diff changeset
28 added 1 changesets with 1 changes to 1 files (+1 heads)
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 32698
diff changeset
29 new changesets 107cefe13e42
31167
696e321b304d update: add experimental config for default way of handling dirty wdir
Martin von Zweigbergk <martinvonz@google.com>
parents: 30332
diff changeset
30 abort: uncommitted changes
696e321b304d update: add experimental config for default way of handling dirty wdir
Martin von Zweigbergk <martinvonz@google.com>
parents: 30332
diff changeset
31 [255]
696e321b304d update: add experimental config for default way of handling dirty wdir
Martin von Zweigbergk <martinvonz@google.com>
parents: 30332
diff changeset
32 $ hg --config extensions.strip= strip --no-backup tip
696e321b304d update: add experimental config for default way of handling dirty wdir
Martin von Zweigbergk <martinvonz@google.com>
parents: 30332
diff changeset
33 $ hg co -qC tip
696e321b304d update: add experimental config for default way of handling dirty wdir
Martin von Zweigbergk <martinvonz@google.com>
parents: 30332
diff changeset
34
28065
6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26968
diff changeset
35 Should not update to the other topological branch:
5080
73fdc8bd3ed8 Update on pull -u when heads were closed (fixes issue666).
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
36
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
37 $ hg pull -u ../tt
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
38 pulling from ../tt
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
39 searching for changes
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
40 adding changesets
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
41 adding manifests
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
42 adding file changes
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
43 added 1 changesets with 1 changes to 1 files (+1 heads)
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 32698
diff changeset
44 new changesets 107cefe13e42
28065
6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26968
diff changeset
45 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: 31167
diff changeset
46 updated to "800c91d5bfc1: m"
28065
6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26968
diff changeset
47 1 other heads for branch "default"
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
48
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
49 $ cd ../tt
5080
73fdc8bd3ed8 Update on pull -u when heads were closed (fixes issue666).
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
50
28065
6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26968
diff changeset
51 Should not update to the other branch:
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
52
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
53 $ hg pull -u ../t
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
54 pulling from ../t
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
55 searching for changes
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
56 adding changesets
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
57 adding manifests
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
58 adding file changes
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
59 added 1 changesets with 1 changes to 1 files (+1 heads)
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 32698
diff changeset
60 new changesets 800c91d5bfc1
28065
6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26968
diff changeset
61 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: 31167
diff changeset
62 updated to "107cefe13e42: m"
28065
6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 26968
diff changeset
63 1 other heads for branch "default"
5080
73fdc8bd3ed8 Update on pull -u when heads were closed (fixes issue666).
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
64
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
65 $ HGMERGE=true hg merge
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
66 merging foo
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
67 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
68 (branch merge, don't forget to commit)
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
69 $ hg ci -mm
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
70
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
71 $ cd ../t
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
72
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
73 Should work:
5080
73fdc8bd3ed8 Update on pull -u when heads were closed (fixes issue666).
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
74
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
75 $ hg pull -u ../tt
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
76 pulling from ../tt
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
77 searching for changes
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
78 adding changesets
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
79 adding manifests
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
80 adding file changes
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
81 added 1 changesets with 1 changes to 1 files (-1 heads)
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 32698
diff changeset
82 new changesets 483b76ad4309
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
83 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 5080
diff changeset
84
28273
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
85 Similarity between "hg update" and "hg pull -u" in handling bookmark
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
86 ====================================================================
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
87
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
88 Test that updating activates the bookmark, which matches with the
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
89 explicit destination of the update.
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
90
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
91 $ echo 4 >> foo
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
92 $ hg commit -m "#4"
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
93 $ hg bookmark active-after-pull
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
94 $ cd ../tt
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
95
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
96 (1) activating by --rev BOOKMARK
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
97
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
98 $ hg bookmark -f active-before-pull
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
99 $ hg bookmarks
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
100 * active-before-pull 3:483b76ad4309
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
101
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
102 $ hg pull -u -r active-after-pull
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34705
diff changeset
103 pulling from $TESTTMP/t
28273
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
104 searching for changes
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
105 adding changesets
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
106 adding manifests
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
107 adding file changes
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
108 added 1 changesets with 1 changes to 1 files
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
109 adding remote bookmark active-after-pull
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 32698
diff changeset
110 new changesets f815b3da6163
28273
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
111 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
112 (activating bookmark active-after-pull)
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
113
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
114 $ hg parents -q
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
115 4:f815b3da6163
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
116 $ hg bookmarks
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
117 * active-after-pull 4:f815b3da6163
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
118 active-before-pull 3:483b76ad4309
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
119
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
120 (discard pulled changes)
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
121
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
122 $ hg update -q 483b76ad4309
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
123 $ hg rollback -q
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
124
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
125 (2) activating by URL#BOOKMARK
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
126
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
127 $ hg bookmark -f active-before-pull
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
128 $ hg bookmarks
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
129 * active-before-pull 3:483b76ad4309
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
130
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
131 $ hg pull -u $TESTTMP/t#active-after-pull
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34705
diff changeset
132 pulling from $TESTTMP/t
28273
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
133 searching for changes
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
134 adding changesets
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
135 adding manifests
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
136 adding file changes
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
137 added 1 changesets with 1 changes to 1 files
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
138 adding remote bookmark active-after-pull
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 32698
diff changeset
139 new changesets f815b3da6163
28273
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
140 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
141 (activating bookmark active-after-pull)
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
142
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
143 $ hg parents -q
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
144 4:f815b3da6163
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
145 $ hg bookmarks
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
146 * active-after-pull 4:f815b3da6163
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
147 active-before-pull 3:483b76ad4309
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28065
diff changeset
148
28274
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
149 (discard pulled changes)
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
150
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
151 $ hg update -q 483b76ad4309
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
152 $ hg rollback -q
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
153
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
154 Test that updating deactivates current active bookmark, if the
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
155 destination of the update is explicitly specified, and it doesn't
30332
318a24b52eeb spelling: fixes of non-dictionary words
Mads Kiilerich <madski@unity3d.com>
parents: 28274
diff changeset
156 match with the name of any existing bookmarks.
28274
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
157
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
158 $ cd ../t
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
159 $ hg bookmark -d active-after-pull
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
160 $ hg branch bar -q
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
161 $ hg commit -m "#5 (bar #1)"
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
162 $ cd ../tt
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
163
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
164 (1) deactivating by --rev REV
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
165
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
166 $ hg bookmark -f active-before-pull
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
167 $ hg bookmarks
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
168 * active-before-pull 3:483b76ad4309
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
169
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
170 $ hg pull -u -r b5e4babfaaa7
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34705
diff changeset
171 pulling from $TESTTMP/t
28274
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
172 searching for changes
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
173 adding changesets
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
174 adding manifests
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
175 adding file changes
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
176 added 2 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: 32698
diff changeset
177 new changesets f815b3da6163:b5e4babfaaa7
28274
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
178 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
179 (leaving bookmark active-before-pull)
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
180
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
181 $ hg parents -q
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
182 5:b5e4babfaaa7
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
183 $ hg bookmarks
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
184 active-before-pull 3:483b76ad4309
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
185
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
186 (discard pulled changes)
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
187
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
188 $ hg update -q 483b76ad4309
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
189 $ hg rollback -q
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
190
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
191 (2) deactivating by --branch BRANCH
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
192
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
193 $ hg bookmark -f active-before-pull
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
194 $ hg bookmarks
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
195 * active-before-pull 3:483b76ad4309
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
196
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
197 $ hg pull -u -b bar
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34705
diff changeset
198 pulling from $TESTTMP/t
28274
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
199 searching for changes
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
200 adding changesets
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
201 adding manifests
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
202 adding file changes
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
203 added 2 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: 32698
diff changeset
204 new changesets f815b3da6163:b5e4babfaaa7
28274
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
205 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
206 (leaving bookmark active-before-pull)
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
207
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
208 $ hg parents -q
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
209 5:b5e4babfaaa7
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
210 $ hg bookmarks
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
211 active-before-pull 3:483b76ad4309
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
212
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
213 (discard pulled changes)
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
214
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
215 $ hg update -q 483b76ad4309
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
216 $ hg rollback -q
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
217
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
218 (3) deactivating by URL#ANOTHER-BRANCH
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
219
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
220 $ hg bookmark -f active-before-pull
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
221 $ hg bookmarks
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
222 * active-before-pull 3:483b76ad4309
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
223
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
224 $ hg pull -u $TESTTMP/t#bar
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 34705
diff changeset
225 pulling from $TESTTMP/t
28274
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
226 searching for changes
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
227 adding changesets
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
228 adding manifests
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
229 adding file changes
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
230 added 2 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: 32698
diff changeset
231 new changesets f815b3da6163:b5e4babfaaa7
28274
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
232 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
233 (leaving bookmark active-before-pull)
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
234
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
235 $ hg parents -q
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
236 5:b5e4babfaaa7
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
237 $ hg bookmarks
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
238 active-before-pull 3:483b76ad4309
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28273
diff changeset
239
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 14485
diff changeset
240 $ cd ..