mercurial: tests/test-pull-branch.t@4f36738a869a (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
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 14485 diff changeset	8	(branches are permanent and global, did you want a bookmark?)
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	9	$ echo a1 > foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	10	$ 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	11
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	12	$ cd ..
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	13	$ hg init tt
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	14	$ cd tt
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	15	$ hg pull ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	16	pulling from ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	17	requesting all changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	18	adding changesets
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	19	adding manifests
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	20	adding file changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	21	added 2 changesets with 2 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	22	new changesets 495a0ec48aaf:50e089d141b7
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	23	(run 'hg update' to get a working copy)
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	24	$ hg up branchA
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	25	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	26
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	27	$ cd ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	28	$ echo a2 > foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	29	$ hg ci -ma2 # 2
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	30
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	31	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	32
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	33	$ hg up 0
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	34	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	35	$ hg branch branchB
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	36	marked working directory as branch branchB
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	37	$ echo b1 > foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	38	$ hg ci -mb1 # 3
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	$ cd ../tt
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	41
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	42	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	43
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	44	$ hg pull -u ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	45	pulling from ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	46	searching for changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	47	adding changesets
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	48	adding manifests
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	49	adding file changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	50	added 2 changesets with 2 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	51	new changesets 9f878dea0b96:5be59ce5067b
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	52	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	53
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	54	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	55
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	56	$ cd ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	57	$ hg up branchA
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	58	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	59	$ echo a3 > foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	60	$ hg ci -ma3 # 4
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	61	$ hg up branchB
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	62	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	63	$ echo b2 > foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	64	$ hg ci -mb2 # 5
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	65
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	66	$ cd ../tt
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	67
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	68	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	69
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	70	$ hg pull -u ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	71	pulling from ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	72	searching for changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	73	adding changesets
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	74	adding manifests
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	75	adding file changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	76	added 2 changesets with 2 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	77	new changesets 7c8fe7e20c32:453e93fa00a5
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	78	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	79
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	80	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	81
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	82	$ cd ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	83	$ hg up branchA
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 a4 > foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	86	$ hg ci -ma4 # 6
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	87	$ hg up branchB
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.1 > foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	90	$ hg ci -m b3.1 # 7
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	91	$ hg up 5
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	92	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	93	$ echo b3.2 > foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	94	$ hg ci -m b3.2 # 8
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	95	created new head
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	96
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	97	$ cd ../tt
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	98
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	99	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	100
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	101	$ hg pull -u ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	102	pulling from ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	103	searching for changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	104	adding changesets
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	105	adding manifests
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	106	adding file changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	107	added 3 changesets with 3 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	108	new changesets da3a8a0161c6:b61cab8fe4e8
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	109	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	110
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	111	$ cd ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	112	$ hg up -C branchA
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	113	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	114	$ echo a5.1 > foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	115	$ hg ci -ma5.1 # 9
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	116	$ hg up 6
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 a5.2 > foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	119	$ hg ci -ma5.2 # 10
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	120	created new head
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	121	$ hg up 7
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	122	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	123	$ echo b4.1 > foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	124	$ hg ci -m b4.1 # 11
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	125	$ hg up -C 8
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	126	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	127	$ echo b4.2 > foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	128	$ 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	129
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	130	$ cd ../tt
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	131
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	132	$ hg pull -u ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	133	pulling from ../t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	134	searching for changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	135	adding changesets
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	136	adding manifests
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	137	adding file changes
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	138	added 4 changesets with 4 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	139	new changesets 0c4d148ae29e:ecfc3f4a6fd9
14485 610873cf064a Make pull -u behave like pull && update Brendan Cully <brendan@kublai.com> parents: 13804 diff changeset	140	1 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: 28030 diff changeset	141	updated to "d740e1a584e7: a5.2"
28030 ca2a0a654f54 update: warn about other topological head in pull and unbundle Pierre-Yves David <pierre-yves.david@fb.com> parents: 25295 diff changeset	142	1 other heads for branch "branchA"
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 7372 diff changeset	143
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	144	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	145
14485 610873cf064a Make pull -u behave like pull && update Brendan Cully <brendan@kublai.com> parents: 13804 diff changeset	146	$ hg up 6
610873cf064a Make pull -u behave like pull && update Brendan Cully <brendan@kublai.com> parents: 13804 diff changeset	147	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
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	148	$ 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	149	marked working directory as branch branchC
17345 4f8054d3171b check-code: fix check for trailing whitespace on sh command lines Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	150	$ 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	151	$ 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	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	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	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	$ 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	157	$ 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	158	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
17345 4f8054d3171b check-code: fix check for trailing whitespace on sh command lines Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	159	$ 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	160	$ 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	161	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	162
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	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	164
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	165	$ 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	166	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	167	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	168	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	169	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	170	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	171	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	172	new changesets 7d8ffa4c0b22
38250 d0abd7949ea3 phases: use "published" in the phase movement message Boris Feld <boris.feld@octobus.net> parents: 38249 diff changeset	173	13 local changesets published
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	174	(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	175
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	176	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	177
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	178	$ cd ../tt
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	179	$ hg pull ../t
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	180	pulling from ../t
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	181	searching for changes
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	182	adding changesets
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	183	adding manifests
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	184	adding file changes
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	185	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	186	new changesets 2b94b54b6b5f
38250 d0abd7949ea3 phases: use "published" in the phase movement message Boris Feld <boris.feld@octobus.net> parents: 38249 diff changeset	187	1 local changesets published
13804 7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	188	(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	189	$ 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	190	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	191	$ echo a1 > bar1
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	192	$ 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	193	adding bar1
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	194	$ hg up branchC
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	195	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	196	$ echo a1 > bar2
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	197	$ 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	198	adding bar2
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	199
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	200	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	201
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	202	$ cd ../t
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	203	$ hg up default
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	204	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	205	$ echo a1 > bar3
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	206	$ 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	207	adding bar3
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	208	$ hg up branchC
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	209	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	210	$ echo a1 > bar4
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	211	$ 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	212	adding bar4
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	213
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	214	Pull from tt
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	215
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	216	$ hg pull ../tt
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	217	pulling from ../tt
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	218	searching for changes
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	219	adding changesets
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	220	adding manifests
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	221	adding file changes
7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	222	added 2 changesets with 2 changes to 2 files (+2 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	223	new changesets eed40c14b407:e634733b0309
38250 d0abd7949ea3 phases: use "published" in the phase movement message Boris Feld <boris.feld@octobus.net> parents: 38249 diff changeset	224	1 local changesets published
13804 7dc2bd4c0dc8 pull: new output message when there are multiple branches Kevin Berridge <kevin.w.berridge@gmail.com> parents: 13803 diff changeset	225	(run 'hg heads .' to see heads, 'hg merge' to merge)
16913 f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 15615 diff changeset	226
f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 15615 diff changeset	227	$ cd ..

author	pacien <pacien.trangirard@pacien.net>
	Thu, 22 Sep 2022 16:09:53 +0200
changeset 49499	4f36738a869a
parent 38250	d0abd7949ea3
permissions	-rw-r--r--