Mercurial: tests/test-pull-update.t@6e36b9fc7869 (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)
19798 76df01e56e7f update: improve error message for clean non-linear update Siddharth Agarwal <sid0@fb.com> parents: 16913 diff changeset	28	not updating: not a linear update
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)
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	30
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	31	$ cd ../tt
5080 73fdc8bd3ed8 Update on pull -u when heads were closed (fixes issue666). Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	32
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	33	Should not update:
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	34
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	35	$ hg pull -u ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	36	pulling from ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	37	searching for changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	38	adding changesets
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	39	adding manifests
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	40	adding file changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	41	added 1 changesets with 1 changes to 1 files (+1 heads)
19798 76df01e56e7f update: improve error message for clean non-linear update Siddharth Agarwal <sid0@fb.com> parents: 16913 diff changeset	42	not updating: not a linear update
76df01e56e7f update: improve error message for clean non-linear update Siddharth Agarwal <sid0@fb.com> parents: 16913 diff changeset	43	(merge or update --check to force update)
5080 73fdc8bd3ed8 Update on pull -u when heads were closed (fixes issue666). Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	44
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	45	$ HGMERGE=true hg merge
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	46	merging foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	47	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	48	(branch merge, don't forget to commit)
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	49	$ hg ci -mm
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	50
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	51	$ cd ../t
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	Should work:
5080 73fdc8bd3ed8 Update on pull -u when heads were closed (fixes issue666). Thomas Arendsen Hein <thomas@intevation.de> parents: diff changeset	54
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	55	$ hg pull -u ../tt
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	56	pulling from ../tt
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	57	searching for changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	58	adding changesets
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	59	adding manifests
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	60	adding file changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	61	added 1 changesets with 1 changes to 1 files (-1 heads)
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	62	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 5080 diff changeset	63
16913 f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 14485 diff changeset	64	$ cd ..

author	Matt Harbison <matt_harbison@yahoo.com>
	Thu, 25 Dec 2014 21:50:35 -0500
changeset 23674	6e36b9fc7869
parent 19798	76df01e56e7f
child 26968	216cc65cf227
permissions	-rw-r--r--