mercurial: tests/test-pull-branch.t@7dc2bd4c0dc8 (annotated)

12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	1	$ hg init t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	2	$ cd t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	3	$ echo 1 > foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	4	$ hg ci -Am1 # 0
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	5	adding foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	6	$ hg branch branchA
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	7	marked working directory as branch branchA
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	8	$ echo a1 > foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	9	$ hg ci -ma1 # 1
7372 e17dbf140035 pull: update to branch tip if there is only one head on the current branch Benoit Allard <benoit@aeteurope.nl> parents: diff changeset	10
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	11	$ cd ..
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	12	$ hg init tt
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	13	$ cd tt
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	14	$ hg pull ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	15	pulling from ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	16	requesting all changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	17	adding changesets
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	18	adding manifests
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	19	adding file changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	20	added 2 changesets with 2 changes to 1 files
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	21	(run 'hg update' to get a working copy)
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	22	$ hg up branchA
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	23	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7372 e17dbf140035 pull: update to branch tip if there is only one head on the current branch Benoit Allard <benoit@aeteurope.nl> parents: diff changeset	24
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	25	$ cd ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	26	$ echo a2 > foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	27	$ hg ci -ma2 # 2
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	28
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	29	Create branch B:
7372 e17dbf140035 pull: update to branch tip if there is only one head on the current branch Benoit Allard <benoit@aeteurope.nl> parents: diff changeset	30
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	31	$ hg up 0
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	32	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	33	$ hg branch branchB
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	34	marked working directory as branch branchB
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	35	$ echo b1 > foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	36	$ hg ci -mb1 # 3
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	37
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	38	$ cd ../tt
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	39
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	40	A new branch is there
7372 e17dbf140035 pull: update to branch tip if there is only one head on the current branch Benoit Allard <benoit@aeteurope.nl> parents: diff changeset	41
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	42	$ hg pull -u ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	43	pulling from ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	44	searching for changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	45	adding changesets
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	46	adding manifests
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	47	adding file changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	48	added 2 changesets with 2 changes to 1 files (+1 heads)
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	49	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	50
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	51	Develop both branches:
7372 e17dbf140035 pull: update to branch tip if there is only one head on the current branch Benoit Allard <benoit@aeteurope.nl> parents: diff changeset	52
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	53	$ cd ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	54	$ hg up branchA
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	55	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	56	$ echo a3 > foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	57	$ hg ci -ma3 # 4
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	58	$ hg up branchB
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	59	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	60	$ echo b2 > foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	61	$ hg ci -mb2 # 5
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	62
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	63	$ cd ../tt
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	64
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	65	Should succeed, no new heads:
7372 e17dbf140035 pull: update to branch tip if there is only one head on the current branch Benoit Allard <benoit@aeteurope.nl> parents: diff changeset	66
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	67	$ hg pull -u ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	68	pulling from ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	69	searching for changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	70	adding changesets
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	71	adding manifests
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	72	adding file changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	73	added 2 changesets with 2 changes to 1 files
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	74	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	75
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	76	Add a head on other branch:
7372 e17dbf140035 pull: update to branch tip if there is only one head on the current branch Benoit Allard <benoit@aeteurope.nl> parents: diff changeset	77
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	78	$ cd ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	79	$ hg up branchA
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	80	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	81	$ echo a4 > foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	82	$ hg ci -ma4 # 6
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	83	$ hg up branchB
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	84	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	85	$ echo b3.1 > foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	86	$ hg ci -m b3.1 # 7
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	87	$ hg up 5
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	88	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	89	$ echo b3.2 > foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	90	$ hg ci -m b3.2 # 8
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	91	created new head
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	92
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	93	$ cd ../tt
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	94
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	95	Should succeed because there is only one head on our branch:
7372 e17dbf140035 pull: update to branch tip if there is only one head on the current branch Benoit Allard <benoit@aeteurope.nl> parents: diff changeset	96
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	97	$ hg pull -u ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	98	pulling from ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	99	searching for changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	100	adding changesets
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	101	adding manifests
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	102	adding file changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	103	added 3 changesets with 3 changes to 1 files (+1 heads)
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	104	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7372 e17dbf140035 pull: update to branch tip if there is only one head on the current branch Benoit Allard <benoit@aeteurope.nl> parents: diff changeset	105
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	106	$ cd ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	107	$ hg up -C branchA
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	108	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	109	$ echo a5.1 > foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	110	$ hg ci -ma5.1 # 9
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	111	$ hg up 6
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	112	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	113	$ echo a5.2 > foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	114	$ hg ci -ma5.2 # 10
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	115	created new head
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	116	$ hg up 7
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	117	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	118	$ echo b4.1 > foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	119	$ hg ci -m b4.1 # 11
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	120	$ hg up -C 8
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	121	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	122	$ echo b4.2 > foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	123	$ hg ci -m b4.2 # 12
7372 e17dbf140035 pull: update to branch tip if there is only one head on the current branch Benoit Allard <benoit@aeteurope.nl> parents: diff changeset	124
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	125	$ cd ../tt
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	126
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	127	$ hg pull -u ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	128	pulling from ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	129	searching for changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	130	adding changesets
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	131	adding manifests
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	132	adding file changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	133	added 4 changesets with 4 changes to 1 files (+1 heads)
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	134	not updating, since new heads added
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	135	(run 'hg heads' to see heads, 'hg merge' to merge)
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	136
13803 e380964d53f8 pull: don't suggest running hg merge when new heads are on different branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 12279 diff changeset	137	Make changes on new branch on tt
e380964d53f8 pull: don't suggest running hg merge when new heads are on different branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 12279 diff changeset	138
e380964d53f8 pull: don't suggest running hg merge when new heads are on different branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 12279 diff changeset	139	$ hg branch branchC
e380964d53f8 pull: don't suggest running hg merge when new heads are on different branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 12279 diff changeset	140	marked working directory as branch branchC
e380964d53f8 pull: don't suggest running hg merge when new heads are on different branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 12279 diff changeset	141	$ echo b1 > bar
13804 7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	142	$ hg ci -Am "commit on branchC on tt"
13803 e380964d53f8 pull: don't suggest running hg merge when new heads are on different branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 12279 diff changeset	143	adding bar
e380964d53f8 pull: don't suggest running hg merge when new heads are on different branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 12279 diff changeset	144
e380964d53f8 pull: don't suggest running hg merge when new heads are on different branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 12279 diff changeset	145	Make changes on default branch on t
e380964d53f8 pull: don't suggest running hg merge when new heads are on different branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 12279 diff changeset	146
e380964d53f8 pull: don't suggest running hg merge when new heads are on different branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 12279 diff changeset	147	$ cd ../t
e380964d53f8 pull: don't suggest running hg merge when new heads are on different branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 12279 diff changeset	148	$ hg up -C default
e380964d53f8 pull: don't suggest running hg merge when new heads are on different branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 12279 diff changeset	149	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
e380964d53f8 pull: don't suggest running hg merge when new heads are on different branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 12279 diff changeset	150	$ echo a1 > bar
13804 7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	151	$ hg ci -Am "commit on default on t"
13803 e380964d53f8 pull: don't suggest running hg merge when new heads are on different branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 12279 diff changeset	152	adding bar
e380964d53f8 pull: don't suggest running hg merge when new heads are on different branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 12279 diff changeset	153
e380964d53f8 pull: don't suggest running hg merge when new heads are on different branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 12279 diff changeset	154	Pull branchC from tt
e380964d53f8 pull: don't suggest running hg merge when new heads are on different branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 12279 diff changeset	155
e380964d53f8 pull: don't suggest running hg merge when new heads are on different branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 12279 diff changeset	156	$ hg pull ../tt
e380964d53f8 pull: don't suggest running hg merge when new heads are on different branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 12279 diff changeset	157	pulling from ../tt
e380964d53f8 pull: don't suggest running hg merge when new heads are on different branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 12279 diff changeset	158	searching for changes
e380964d53f8 pull: don't suggest running hg merge when new heads are on different branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 12279 diff changeset	159	adding changesets
e380964d53f8 pull: don't suggest running hg merge when new heads are on different branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 12279 diff changeset	160	adding manifests
e380964d53f8 pull: don't suggest running hg merge when new heads are on different branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 12279 diff changeset	161	adding file changes
e380964d53f8 pull: don't suggest running hg merge when new heads are on different branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 12279 diff changeset	162	added 1 changesets with 1 changes to 1 files (+1 heads)
e380964d53f8 pull: don't suggest running hg merge when new heads are on different branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 12279 diff changeset	163	(run 'hg heads' to see heads)
13804 7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	164
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	165	Make changes on default and branchC on tt
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	166
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	167	$ cd ../tt
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	168	$ hg pull ../t
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	169	pulling from ../t
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	170	searching for changes
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	171	adding changesets
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	172	adding manifests
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	173	adding file changes
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	174	added 1 changesets with 1 changes to 1 files (+1 heads)
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	175	(run 'hg heads' to see heads)
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	176	$ hg up -C default
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	177	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	178	$ echo a1 > bar1
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	179	$ hg ci -Am "commit on default on tt"
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	180	adding bar1
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	181	$ hg up branchC
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	182	2 files updated, 0 files merged, 1 files removed, 0 files unresolved
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	183	$ echo a1 > bar2
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	184	$ hg ci -Am "commit on branchC on tt"
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	185	adding bar2
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	186
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	187	Make changes on default and branchC on t
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	188
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	189	$ cd ../t
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	190	$ hg up default
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	191	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	192	$ echo a1 > bar3
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	193	$ hg ci -Am "commit on default on t"
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	194	adding bar3
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	195	$ hg up branchC
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	196	2 files updated, 0 files merged, 1 files removed, 0 files unresolved
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	197	$ echo a1 > bar4
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	198	$ hg ci -Am "commit on branchC on tt"
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	199	adding bar4
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	200
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	201	Pull from tt
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	202
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	203	$ hg pull ../tt
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	204	pulling from ../tt
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	205	searching for changes
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	206	adding changesets
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	207	adding manifests
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	208	adding file changes
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	209	added 2 changesets with 2 changes to 2 files (+2 heads)
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	210	(run 'hg heads .' to see heads, 'hg merge' to merge)

author	Kevin Berridge <kevin.w.berridge@gmail.com>
	Mon, 28 Mar 2011 20:56:56 -0400
changeset 13804	7dc2bd4c0dc8
parent 13803	e380964d53f8
child 14485	610873cf064a
permissions	-rw-r--r--