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

author	Patrick Mezard <pmezard@gmail.com>
	Sat, 11 Apr 2009 00:13:18 +0200
changeset 8044	c1e2b7407dc3
parent 8036	dbcf5d52fcf5
child 8045	e09a2f2ef85d
permissions	-rw-r--r--