mercurial: tests/test-rebase-rename.out@4ab87473029d (annotated)

7954 b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	1	adding a
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	2	adding b
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	3	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	4	created new head
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	5
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	6	% Rename is tracked
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	7	2:rename A
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	8	diff --git a/a b/a-renamed
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	9	rename from a
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	10	rename to a-renamed
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	11
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	12	% Rebase the revision containing the rename
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	13
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	14	% Rename is not lost
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	15	2:rename A
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	16	diff --git a/a b/a-renamed
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	17	rename from a
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	18	rename to a-renamed
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	19
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	20	adding a
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	21	adding b
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	22	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	23	created new head
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	24
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	25	% Copy is tracked
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	26	2:copy A
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	27	diff --git a/a b/a-copied
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	28	copy from a
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	29	copy to a-copied
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	30
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	31	% Rebase the revision containing the copy
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	32
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	33	% Copy is not lost
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	34	2:copy A
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	35	diff --git a/a b/a-copied
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	36	copy from a
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	37	copy to a-copied
b969611064ae rebase: don't lose rename/copy data (Issue1423) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	38

author	Will Maier <willmaier@ml1.net>
	Tue, 14 Sep 2010 22:26:43 -0500
changeset 12303	4ab87473029d
parent 11197	4bb4895e1693
permissions	-rw-r--r--