Mercurial: tests/test-pull-update.t@e834b79def74 (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
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
38250 d0abd7949ea3 phases: use "published" in the phase movement message Boris Feld <boris.feld@octobus.net> parents: 38249 diff changeset	30	1 local changesets published
31167 696e321b304d update: add experimental config for default way of handling dirty wdir Martin von Zweigbergk <martinvonz@google.com> parents: 30332 diff changeset	31	abort: uncommitted changes
45840 527ce85c2e60 errors: introduce StateError and use it from commands and cmdutil Martin von Zweigbergk <martinvonz@google.com> parents: 42897 diff changeset	32	[20]
31167 696e321b304d update: add experimental config for default way of handling dirty wdir Martin von Zweigbergk <martinvonz@google.com> parents: 30332 diff changeset	33	$ 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	34	$ 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	35
28065 6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 26968 diff changeset	36	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	37
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	38	$ hg pull -u ../tt
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	39	pulling from ../tt
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	40	searching for changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	41	adding changesets
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	42	adding manifests
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	43	adding file changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	44	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	45	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	46	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	47	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	48	1 other heads for branch "default"
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	$ cd ../tt
5080 73fdc8bd3ed8 Update on pull -u when heads were closed (fixes issue666). Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	51
28065 6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 26968 diff changeset	52	Should not update to the other branch:
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	53
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	54	$ hg pull -u ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	55	pulling from ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	56	searching for changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	57	adding changesets
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	58	adding manifests
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	59	adding file changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	60	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	61	new changesets 800c91d5bfc1
38250 d0abd7949ea3 phases: use "published" in the phase movement message Boris Feld <boris.feld@octobus.net> parents: 38249 diff changeset	62	1 local changesets published
28065 6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC) Pierre-Yves David <pierre-yves.david@fb.com> parents: 26968 diff changeset	63	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	64	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	65	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	66
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	67	$ HGMERGE=true hg merge
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	68	merging foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	69	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	70	(branch merge, don't forget to commit)
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	71	$ hg ci -mm
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	$ cd ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	74
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	75	Should work:
5080 73fdc8bd3ed8 Update on pull -u when heads were closed (fixes issue666). Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	76
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	77	$ hg pull -u ../tt
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	78	pulling from ../tt
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	79	searching for changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	80	adding changesets
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	81	adding manifests
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	82	adding file changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	83	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	84	new changesets 483b76ad4309
38250 d0abd7949ea3 phases: use "published" in the phase movement message Boris Feld <boris.feld@octobus.net> parents: 38249 diff changeset	85	1 local changesets published
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	86	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	87
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	88	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	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
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	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	92	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	93
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	$ 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	95	$ 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	96	$ 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	97	$ 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	98
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	(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	100
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	$ 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	102	$ 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	103	* 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	104
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	$ 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	106	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	107	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	108	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	109	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	110	adding file changes
42897 d7304434390f changegroup: move message about added changes to transaction summary Pierre-Yves David <pierre-yves.david@octobus.net> parents: 38250 diff changeset	111	adding remote bookmark active-after-pull
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	112	added 1 changesets with 1 changes to 1 files
34661 eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32698 diff changeset	113	new changesets f815b3da6163
38250 d0abd7949ea3 phases: use "published" in the phase movement message Boris Feld <boris.feld@octobus.net> parents: 38249 diff changeset	114	1 local changesets published
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	115	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	116	(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	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	$ 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	119	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	120	$ 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	121	* 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	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	(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	125
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	$ 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	127	$ 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	128
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	(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	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 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	132	$ 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	133	* 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	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 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	136	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	137	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	138	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	139	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	140	adding file changes
42897 d7304434390f changegroup: move message about added changes to transaction summary Pierre-Yves David <pierre-yves.david@octobus.net> parents: 38250 diff changeset	141	adding remote bookmark active-after-pull
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	142	added 1 changesets with 1 changes to 1 files
34661 eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC) Denis Laxalde <denis.laxalde@logilab.fr> parents: 32698 diff changeset	143	new changesets f815b3da6163
38250 d0abd7949ea3 phases: use "published" in the phase movement message Boris Feld <boris.feld@octobus.net> parents: 38249 diff changeset	144	1 local changesets published
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	145	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	146	(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	147
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	$ 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	149	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	150	$ 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	151	* 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	152	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	153
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	154	(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	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	$ 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	157	$ 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	158
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	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	160	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	161	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	162
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	$ 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	164	$ 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	165	$ 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	166	$ 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	167	$ 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	168
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) 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	170
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	$ 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	172	$ 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	173	* 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	174
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	$ 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	176	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	177	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	178	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	179	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	180	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	181	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	182	new changesets f815b3da6163:b5e4babfaaa7
38250 d0abd7949ea3 phases: use "published" in the phase movement message Boris Feld <boris.feld@octobus.net> parents: 38249 diff changeset	183	1 local changesets published
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	184	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	185	(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	186
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	$ 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	188	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	189	$ 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	190	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	191
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	(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	193
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 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	195	$ 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	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	(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	198
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	$ 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	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	$ 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	204	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	205	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	206	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	207	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	208	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	209	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	210	new changesets f815b3da6163:b5e4babfaaa7
38250 d0abd7949ea3 phases: use "published" in the phase movement message Boris Feld <boris.feld@octobus.net> parents: 38249 diff changeset	211	1 local changesets published
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	212	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	213	(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	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 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	216	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	217	$ 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	218	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	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	(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	221
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	$ 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	223	$ 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	224
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	(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	226
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	$ 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	228	$ 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	229	* 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	230
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28273 diff changeset	231	$ 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	232	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	233	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	234	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	235	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	236	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	237	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	238	new changesets f815b3da6163:b5e4babfaaa7
38250 d0abd7949ea3 phases: use "published" in the phase movement message Boris Feld <boris.feld@octobus.net> parents: 38249 diff changeset	239	1 local changesets published
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	240	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	241	(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	242
5d9578d9ad1a pull: deactivate a bookmark not matching with the destination of the update FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28273 diff changeset	243	$ 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	244	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	245	$ 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	246	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	247
16913 f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 14485 diff changeset	248	$ cd ..
46759 ce42fe36d581 tests: move a test about update in test-pull-update.t Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45840 diff changeset	249
ce42fe36d581 tests: move a test about update in test-pull-update.t Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45840 diff changeset	250	Issue622: hg init && hg pull -u URL doesn't checkout default branch
ce42fe36d581 tests: move a test about update in test-pull-update.t Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45840 diff changeset	251
ce42fe36d581 tests: move a test about update in test-pull-update.t Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45840 diff changeset	252	$ hg init test
ce42fe36d581 tests: move a test about update in test-pull-update.t Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45840 diff changeset	253	$ cd test
ce42fe36d581 tests: move a test about update in test-pull-update.t Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45840 diff changeset	254	$ echo foo>foo
ce42fe36d581 tests: move a test about update in test-pull-update.t Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45840 diff changeset	255	$ hg addremove
ce42fe36d581 tests: move a test about update in test-pull-update.t Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45840 diff changeset	256	adding foo
ce42fe36d581 tests: move a test about update in test-pull-update.t Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45840 diff changeset	257	$ hg commit -m 1
ce42fe36d581 tests: move a test about update in test-pull-update.t Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45840 diff changeset	258	$ cd ..
ce42fe36d581 tests: move a test about update in test-pull-update.t Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45840 diff changeset	259
ce42fe36d581 tests: move a test about update in test-pull-update.t Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45840 diff changeset	260	$ hg init empty
ce42fe36d581 tests: move a test about update in test-pull-update.t Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45840 diff changeset	261	$ cd empty
ce42fe36d581 tests: move a test about update in test-pull-update.t Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45840 diff changeset	262	$ hg pull -u ../test
ce42fe36d581 tests: move a test about update in test-pull-update.t Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45840 diff changeset	263	pulling from ../test
ce42fe36d581 tests: move a test about update in test-pull-update.t Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45840 diff changeset	264	requesting all changes
ce42fe36d581 tests: move a test about update in test-pull-update.t Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45840 diff changeset	265	adding changesets
ce42fe36d581 tests: move a test about update in test-pull-update.t Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45840 diff changeset	266	adding manifests
ce42fe36d581 tests: move a test about update in test-pull-update.t Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45840 diff changeset	267	adding file changes
ce42fe36d581 tests: move a test about update in test-pull-update.t Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45840 diff changeset	268	added 1 changesets with 1 changes to 1 files
ce42fe36d581 tests: move a test about update in test-pull-update.t Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45840 diff changeset	269	new changesets 340e38bdcde4
ce42fe36d581 tests: move a test about update in test-pull-update.t Pierre-Yves David <pierre-yves.david@octobus.net> parents: 45840 diff changeset	270	1 files updated, 0 files merged, 0 files removed, 0 files unresolved

author	Simon Sapin <simon.sapin@octobus.net>
	Fri, 10 Sep 2021 09:53:09 +0200
changeset 47955	e834b79def74
parent 46759	ce42fe36d581
permissions	-rw-r--r--