annotate tests/test-commit-copy.out @ 4398:3b7e284b8f28

merge: expand and simplify the invalid handling for directory moves
author Matt Mackall <mpm@selenic.com>
date Thu, 03 May 2007 17:24:43 -0500
parents 6990e499d71a
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3675
6990e499d71a Revert almost all of 5be434785317; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
1 foo renamed from bar:26d3ca0dfd18e44d796b564e38dd173c9668d3a9
6990e499d71a Revert almost all of 5be434785317; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
2 rev offset length base linkrev nodeid p1 p2
6990e499d71a Revert almost all of 5be434785317; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
3 0 0 6 0 0 26d3ca0dfd18 000000000000 000000000000
6990e499d71a Revert almost all of 5be434785317; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
4 1 6 7 1 1 d267bddd54f7 26d3ca0dfd18 000000000000