mercurial: tests/test-rebase-pull.out@5d92fe90be84 (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	(run 'hg heads' to see heads, 'hg merge' to merge)
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	14	saving bundle to
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	15	adding branch
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	16	adding changesets
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	17	adding manifests
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	18	adding file changes
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	19	added 2 changesets with 2 changes to 2 files
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	20	rebase completed
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	21	@ 3:L1
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 2:R1
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 1:C2
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	o 0:C1
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	28
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	29
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	30	% Re-run pull --rebase
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	31	pulling from
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	32	searching for changes
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	33	no changes found
808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	34
7786 92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	35	% 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	36	pulling from
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	37	searching for changes
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	38	adding changesets
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	39	adding manifests
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	40	adding file changes
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	41	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	42	(run 'hg update' to get a working copy)
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	43	nothing to rebase
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	44	@ 2
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	45	\|
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	46
8241 dd1b47e17d7e Fix typeerror when specifying both --rebase and --pull Martijn Pieters <mj@zopatista.com> parents: 7786 diff changeset	47	% pull --rebase --update should ignore --update
dd1b47e17d7e Fix typeerror when specifying both --rebase and --pull Martijn Pieters <mj@zopatista.com> parents: 7786 diff changeset	48	pulling from
dd1b47e17d7e Fix typeerror when specifying both --rebase and --pull Martijn Pieters <mj@zopatista.com> parents: 7786 diff changeset	49	searching for changes
dd1b47e17d7e Fix typeerror when specifying both --rebase and --pull Martijn Pieters <mj@zopatista.com> parents: 7786 diff changeset	50	no changes found
dd1b47e17d7e Fix typeerror when specifying both --rebase and --pull Martijn Pieters <mj@zopatista.com> parents: 7786 diff changeset	51
7786 92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	52	% 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	53	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	54	pulling from
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	55	searching for changes
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	56	no changes found
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	57	o 2
92455c1d6f83 rebase: pull --rebase updates if there is nothing to rebase Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6906 diff changeset	58	\|

author	Wagner Bruna <wbruna@softwareexpress.com.br>
	Tue, 29 Dec 2009 19:02:26 -0200
changeset 10157	5d92fe90be84
parent 9611	a3d73b3e1f8a
child 10628	6227c8d669d5
permissions	-rw-r--r--