mercurial: tests/test-rebase-pull.out@4bb4895e1693 (annotated)

9611 a3d73b3e1f8a hg.clone: report branch name on update Adrian Buehlmann <adrian@cadifra.com> parents: 8241 diff changeset	1	updating to branch default
7786 92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	2	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
9611 a3d73b3e1f8a hg.clone: report branch name on update Adrian Buehlmann <adrian@cadifra.com> parents: 8241 diff changeset	3	updating to branch default
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	4	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	5
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	6	% Now b has one revision to be pulled from a
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	7	pulling from
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	8	searching for changes
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	9	adding changesets
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	10	adding manifests
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	11	adding file changes
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	12	added 1 changesets with 1 changes to 1 files (+1 heads)
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	13	adding branch
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	14	adding changesets
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	15	adding manifests
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	16	adding file changes
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	17	added 2 changesets with 2 changes to 2 files
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	18	rebase completed
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	19	@ 3:L1
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	20	\|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	21	o 2:R1
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	22	\|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	23	o 1:C2
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	24	\|
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	25	o 0:C1
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	26
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	27
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	28	% Re-run pull --rebase
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	29	pulling from
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	30	searching for changes
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	31	no changes found
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	32
7786 92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	33	% Invoke pull --rebase and nothing to rebase
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	34	pulling from
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	35	searching for changes
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	36	adding changesets
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	37	adding manifests
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	38	adding file changes
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	39	added 1 changesets with 1 changes to 1 files
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	40	nothing to rebase
10628 6227c8d669d5 rebase: improve output of hg pull --rebase (issue2072) Sune Foldager <cryo@cyanite.org> parents: 9611 diff changeset	41	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7786 92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	42	@ 2
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	43	\|
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	44
8241 dd1b47e17d7e Fix typeerror when specifying both --rebase and --pull Martijn Pieters <mj@zopatista.com> parents: 7786 diff changeset	45	% pull --rebase --update should ignore --update
dd1b47e17d7e Fix typeerror when specifying both --rebase and --pull Martijn Pieters <mj@zopatista.com> parents: 7786 diff changeset	46	pulling from
dd1b47e17d7e Fix typeerror when specifying both --rebase and --pull Martijn Pieters <mj@zopatista.com> parents: 7786 diff changeset	47	searching for changes
dd1b47e17d7e Fix typeerror when specifying both --rebase and --pull Martijn Pieters <mj@zopatista.com> parents: 7786 diff changeset	48	no changes found
dd1b47e17d7e Fix typeerror when specifying both --rebase and --pull Martijn Pieters <mj@zopatista.com> parents: 7786 diff changeset	49
7786 92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	50	% pull --rebase doesn't update if nothing has been pulled
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	51	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	52	pulling from
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	53	searching for changes
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	54	no changes found
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	55	o 2
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	56	\|

author	Matt Mackall <mpm@selenic.com>
	Wed, 19 May 2010 19:46:39 -0500
changeset 11197	4bb4895e1693
parent 10628	6227c8d669d5
child 11201	34023f2ca305
permissions	-rw-r--r--