Mercurial: tests/test-convert-bzr.out@0c2ba48415c8 (annotated)

7053 209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	1	% create and rename on the same file in the same step
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	2	a => b
8036 dbcf5d52fcf5 test-convert-bzr: check renamed files are removed (issue1505) Patrick Mezard <pmezard@gmail.com> parents: 7053 diff changeset	3	c => d
8045 e09a2f2ef85d convert/bzr: fix file rename replaced by a dir case (issue1583) Patrick Mezard <pmezard@gmail.com> parents: 8036 diff changeset	4	e => f
7053 209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	5	initializing destination source-hg repository
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	6	scanning source...
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	7	sorting...
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	8	converting...
8045 e09a2f2ef85d convert/bzr: fix file rename replaced by a dir case (issue1583) Patrick Mezard <pmezard@gmail.com> parents: 8036 diff changeset	9	1 Initial add: a, c, e
8036 dbcf5d52fcf5 test-convert-bzr: check renamed files are removed (issue1505) Patrick Mezard <pmezard@gmail.com> parents: 7053 diff changeset	10	0 rename a into b, create a, rename c into d
8045 e09a2f2ef85d convert/bzr: fix file rename replaced by a dir case (issue1583) Patrick Mezard <pmezard@gmail.com> parents: 8036 diff changeset	11	o 1 "rename a into b, create a, rename c into d" files: a b c d e f
7053 209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	12	\|
8045 e09a2f2ef85d convert/bzr: fix file rename replaced by a dir case (issue1583) Patrick Mezard <pmezard@gmail.com> parents: 8036 diff changeset	13	o 0 "Initial add: a, c, e" files: a c e
7053 209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	14
8036 dbcf5d52fcf5 test-convert-bzr: check renamed files are removed (issue1505) Patrick Mezard <pmezard@gmail.com> parents: 7053 diff changeset	15	% manifest
dbcf5d52fcf5 test-convert-bzr: check renamed files are removed (issue1505) Patrick Mezard <pmezard@gmail.com> parents: 7053 diff changeset	16	a
dbcf5d52fcf5 test-convert-bzr: check renamed files are removed (issue1505) Patrick Mezard <pmezard@gmail.com> parents: 7053 diff changeset	17	b
dbcf5d52fcf5 test-convert-bzr: check renamed files are removed (issue1505) Patrick Mezard <pmezard@gmail.com> parents: 7053 diff changeset	18	d
8045 e09a2f2ef85d convert/bzr: fix file rename replaced by a dir case (issue1583) Patrick Mezard <pmezard@gmail.com> parents: 8036 diff changeset	19	f
7053 209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	20	% test --rev option
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	21	initializing destination source-1-hg repository
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	22	scanning source...
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	23	sorting...
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	24	converting...
8045 e09a2f2ef85d convert/bzr: fix file rename replaced by a dir case (issue1583) Patrick Mezard <pmezard@gmail.com> parents: 8036 diff changeset	25	0 Initial add: a, c, e
e09a2f2ef85d convert/bzr: fix file rename replaced by a dir case (issue1583) Patrick Mezard <pmezard@gmail.com> parents: 8036 diff changeset	26	o 0 "Initial add: a, c, e" files: a c e
7053 209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	27
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	28	% merge
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	29	initializing destination source-hg repository
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	30	scanning source...
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	31	sorting...
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	32	converting...
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	33	3 Initial add
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	34	2 Editing a
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	35	1 Editing b
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	36	0 Merged improve branch
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	37	o 3 "Merged improve branch" files:
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	38	\|\
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	39	\| o 2 "Editing b" files: b
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	40	\| \|
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	41	o \| 1 "Editing a" files: a
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	42	\|/
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	43	o 0 "Initial add" files: a b
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	44
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	45	% symlinks and executable files
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	46	initializing destination source-hg repository
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	47	scanning source...
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	48	sorting...
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	49	converting...
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	50	1 Initial setup
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	51	0 Symlink changed, x bits changed
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	52	% manifest of 0
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	53	644 altname
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	54	755 * program
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	55	% manifest of tip
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	56	644 altname
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	57	755 * newprog
209ef5f3534c convert: add bzr source Marek Kubica <marek@xivilization.net> parents: diff changeset	58	644 program

author	Matt Mackall <mpm@selenic.com>
	Thu, 23 Apr 2009 15:40:10 -0500
changeset 8145	0c2ba48415c8
parent 8045	e09a2f2ef85d
child 8148	adce97d28389
permissions	-rw-r--r--