mercurial: tests/test-pull-update.t@58f8b29c37ff (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
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	19	Should not update:
5080 73fdc8bd3ed8 Update on pull -u when heads were closed (fixes issue666). Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	20
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	21	$ hg pull -u ../tt
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	22	pulling from ../tt
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	23	searching for changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	24	adding changesets
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	25	adding manifests
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	26	adding file changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	27	added 1 changesets with 1 changes to 1 files (+1 heads)
26968 216cc65cf227 pull: return 255 value on update failure (issue4948) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 19798 diff changeset	28	abort: not updating: not a linear update
19798 76df01e56e7f update: improve error message for clean non-linear update Siddharth Agarwal <sid0@fb.com> parents: 16913 diff changeset	29	(merge or update --check to force update)
26968 216cc65cf227 pull: return 255 value on update failure (issue4948) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 19798 diff changeset	30	[255]
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	31
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	32	$ cd ../tt
5080 73fdc8bd3ed8 Update on pull -u when heads were closed (fixes issue666). Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	33
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	34	Should not update:
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	35
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	36	$ hg pull -u ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	37	pulling from ../t
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)
26968 216cc65cf227 pull: return 255 value on update failure (issue4948) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 19798 diff changeset	43	abort: not updating: not a linear update
19798 76df01e56e7f update: improve error message for clean non-linear update Siddharth Agarwal <sid0@fb.com> parents: 16913 diff changeset	44	(merge or update --check to force update)
26968 216cc65cf227 pull: return 255 value on update failure (issue4948) (BC) liscju <piotr.listkiewicz@gmail.com> parents: 19798 diff changeset	45	[255]
5080 73fdc8bd3ed8 Update on pull -u when heads were closed (fixes issue666). Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	46
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	47	$ HGMERGE=true hg merge
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	48	merging foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	49	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	50	(branch merge, don't forget to commit)
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	51	$ hg ci -mm
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	$ cd ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	54
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	55	Should work:
5080 73fdc8bd3ed8 Update on pull -u when heads were closed (fixes issue666). Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	56
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	57	$ hg pull -u ../tt
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	58	pulling from ../tt
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	59	searching for changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	60	adding changesets
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	61	adding manifests
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	62	adding file changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	63	added 1 changesets with 1 changes to 1 files (-1 heads)
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	64	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	65
16913 f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 14485 diff changeset	66	$ cd ..

author	timeless <timeless@mozdev.org>
	Tue, 12 Jan 2016 06:03:36 +0000
changeset 27729	58f8b29c37ff
parent 26968	216cc65cf227
child 28065	6b1fc09c699a
permissions	-rw-r--r--