Mercurial: tests/test-pull-update.t@84e8a6834223 (annotated)

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
696e321b304d update: add experimental config for default way of handling dirty wdir Martin von Zweigbergk <martinvonz@google.com> parents: 30332 diff changeset	22	$ hg --config experimental.updatecheck=abort pull -u ../tt
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)
696e321b304d update: add experimental config for default way of handling dirty wdir Martin von Zweigbergk <martinvonz@google.com> parents: 30332 diff changeset	29	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	30	[255]
696e321b304d update: add experimental config for default way of handling dirty wdir Martin von Zweigbergk <martinvonz@google.com> parents: 30332 diff changeset	31	$ 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	32	$ 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	33
28065 6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 26968 diff changeset	34	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	35
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	36	$ hg pull -u ../tt
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	37	pulling from ../tt
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	38	searching for changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	39	adding changesets
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	40	adding manifests
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	41	adding file changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	42	added 1 changesets with 1 changes to 1 files (+1 heads)
28065 6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 26968 diff changeset	43	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 26968 diff changeset	44	1 other heads for branch "default"
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	45
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	46	$ cd ../tt
5080 73fdc8bd3ed8 Update on pull -u when heads were closed (fixes issue666). Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	47
28065 6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 26968 diff changeset	48	Should not update to the other branch:
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	49
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	50	$ hg pull -u ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	51	pulling from ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	52	searching for changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	53	adding changesets
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	54	adding manifests
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	55	adding file changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	56	added 1 changesets with 1 changes to 1 files (+1 heads)
28065 6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 26968 diff changeset	57	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 26968 diff changeset	58	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	59
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	60	$ HGMERGE=true hg merge
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	61	merging foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	62	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	63	(branch merge, don't forget to commit)
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	64	$ hg ci -mm
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	65
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	66	$ cd ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	67
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	68	Should work:
5080 73fdc8bd3ed8 Update on pull -u when heads were closed (fixes issue666). Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	69
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	70	$ hg pull -u ../tt
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	71	pulling from ../tt
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	72	searching for changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	73	adding changesets
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	74	adding manifests
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	75	adding file changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	76	added 1 changesets with 1 changes to 1 files (-1 heads)
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	77	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	78
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	79	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	80	====================================================================
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28065 diff changeset	81
9ac8955d8c45 pull: activate a bookmark matching with the destination of the update (BC) FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28065 diff changeset	82	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	83	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	84
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	$ 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	86	$ 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	87	$ 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	88	$ 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	89
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	(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	91
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 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	93	$ 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	94	* 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	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	$ hg pull -u -r 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	97	pulling from $TESTTMP/t (glob)
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	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	99	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	100	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	101	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	102	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	103	adding remote 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	104	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	105	(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	106
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	$ 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	108	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	109	$ 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	110	* 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	111	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	112
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	(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	114
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	$ 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	116	$ 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	117
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	(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	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	$ 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	121	$ 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	122	* 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	123
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	$ hg pull -u $TESTTMP/t#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	125	pulling from $TESTTMP/t (glob)
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	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	127	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	128	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	129	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	130	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	131	adding remote 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	132	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	133	(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	134
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	$ 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	136	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	137	$ 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	138	* 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	139	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	140
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	141	(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	142
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28273 diff changeset	143	$ 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	144	$ 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	145
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28273 diff changeset	146	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	147	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	148	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	149
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	$ 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	151	$ 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	152	$ 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	153	$ 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	154	$ 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	155
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28273 diff changeset	156	(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	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	$ 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	159	$ 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	160	* 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	161
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	$ hg pull -u -r 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	163	pulling from $TESTTMP/t (glob)
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	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	165	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	166	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	167	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	168	added 2 changesets with 1 changes to 1 files
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	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	170	(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	171
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	$ 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	173	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	174	$ 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	175	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	176
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28273 diff changeset	177	(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	178
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	$ 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	180	$ 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	181
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	(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	183
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	$ 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	185	$ 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	186	* 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	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 pull -u -b bar
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	pulling from $TESTTMP/t (glob)
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	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	191	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	192	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	193	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	194	added 2 changesets with 1 changes to 1 files
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	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	196	(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	197
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28273 diff changeset	198	$ 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	199	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	200	$ 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	201	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	202
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	(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	204
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	$ 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	206	$ 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	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	(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	209
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 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	211	$ 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	212	* 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	213
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	$ hg pull -u $TESTTMP/t#bar
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	pulling from $TESTTMP/t (glob)
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	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	217	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	218	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	219	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	220	added 2 changesets with 1 changes to 1 files
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	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	222	(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	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 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	225	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	226	$ 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	227	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	228
16913 f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 14485 diff changeset	229	$ cd ..

author	Simon Farnsworth <simonfar@fb.com>
	Mon, 06 Mar 2017 03:19:40 -0800
changeset 31204	84e8a6834223
parent 31167	696e321b304d
child 32698	1b5c61d38a52
permissions	-rw-r--r--