Mercurial: tests/test-mv-cp-st-diff.out annotate

annotate tests/test-mv-cp-st-diff.out @ 10253:b190a8125b43 stable

Work around AIX shell builtin printf not handling \NNN. On AIX, ksh builtin printf does not understand \NNN. Some tests use this to generate test data, and so fail on AIX. Rework these tests to use python to generate the correct characters. This fixes the tests on AIX and should be more generally portable.

author	Jim Hague <jim.hague@acm.org>
date	Wed, 06 Jan 2010 18:03:33 +0000
parents	83cfa1baf8ad
children

rev	line source
9611 a3d73b3e1f8a hg.clone: report branch name on update Adrian Buehlmann <adrian@cadifra.com> parents: 8518 diff changeset	1 updating to branch default
8518 3f4f14eab085 update --clean: do not unlink added files (issue575) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6425 diff changeset	2 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
6336 4b0c9c674707 warn about new heads on commit (issue842) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6286 diff changeset	3 created new head
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	4 rename in working dir
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	5 ** add a a1 / add a a2 / hg mv a b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	6 - working to parent:
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	7 A b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	8 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	9 R a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	10
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	11 diff --git a/a b/b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	12 rename from a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	13 rename to b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	14
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	15 - working to root: --rev 0
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	16 A b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	17 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	18 R a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	19
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	20 diff --git a/a b/b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	21 rename from a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	22 rename to b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	23 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	24 +++ b/b
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	25 @@ -1,1 +1,4 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	26 a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	27 +0
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	28 +a1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	29 +a2
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	30
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	31 - working to branch: --rev 2
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	32 A b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	33 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	34 R a
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	35 R x/y
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	36
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	37 diff --git a/a b/b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	38 rename from a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	39 rename to b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	40 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	41 +++ b/b
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	42 @@ -1,3 +1,4 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	43 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	44 -m1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	45 -m2
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	46 +0
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	47 +a1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	48 +a2
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	49 diff --git a/x/y b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	50 deleted file mode 100644
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	51 --- a/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	52 +++ /dev/null
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	53 @@ -1,1 +0,0 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	54 -y1
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	55
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	56 - root to parent: --rev 0 --rev .
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	57 M a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	58
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	59 diff --git a/a b/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	60 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	61 +++ b/a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	62 @@ -1,1 +1,4 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	63 a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	64 +0
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	65 +a1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	66 +a2
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	67
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	68 - parent to root: --rev . --rev 0
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	69 M a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	70
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	71 diff --git a/a b/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	72 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	73 +++ b/a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	74 @@ -1,4 +1,1 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	75 a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	76 -0
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	77 -a1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	78 -a2
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	79
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	80 - branch to parent: --rev 2 --rev .
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	81 M a
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	82 R x/y
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	83
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	84 diff --git a/a b/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	85 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	86 +++ b/a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	87 @@ -1,3 +1,4 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	88 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	89 -m1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	90 -m2
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	91 +0
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	92 +a1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	93 +a2
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	94 diff --git a/x/y b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	95 deleted file mode 100644
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	96 --- a/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	97 +++ /dev/null
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	98 @@ -1,1 +0,0 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	99 -y1
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	100
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	101 - parent to branch: --rev . --rev 2
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	102 M a
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	103 A x/y
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	104
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	105 diff --git a/a b/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	106 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	107 +++ b/a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	108 @@ -1,4 +1,3 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	109 a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	110 -0
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	111 -a1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	112 -a2
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	113 +m1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	114 +m2
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	115 diff --git a/x/y b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	116 new file mode 100644
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	117 --- /dev/null
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	118 +++ b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	119 @@ -0,0 +1,1 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	120 +y1
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	121
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	122
9611 a3d73b3e1f8a hg.clone: report branch name on update Adrian Buehlmann <adrian@cadifra.com> parents: 8518 diff changeset	123 updating to branch default
8518 3f4f14eab085 update --clean: do not unlink added files (issue575) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6425 diff changeset	124 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
6336 4b0c9c674707 warn about new heads on commit (issue842) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6286 diff changeset	125 created new head
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	126 copy in working dir
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	127 ** add a a1 / add a a2 / hg cp a b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	128 - working to parent:
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	129 A b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	130 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	131
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	132 diff --git a/a b/b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	133 copy from a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	134 copy to b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	135
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	136 - working to root: --rev 0
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	137 M a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	138 A b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	139 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	140
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	141 diff --git a/a b/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	142 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	143 +++ b/a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	144 @@ -1,1 +1,4 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	145 a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	146 +1
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	147 +a1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	148 +a2
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	149 diff --git a/a b/b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	150 copy from a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	151 copy to b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	152 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	153 +++ b/b
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	154 @@ -1,1 +1,4 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	155 a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	156 +1
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	157 +a1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	158 +a2
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	159
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	160 - working to branch: --rev 2
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	161 M a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	162 A b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	163 a
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	164 R x/y
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	165
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	166 diff --git a/a b/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	167 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	168 +++ b/a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	169 @@ -1,3 +1,4 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	170 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	171 -m1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	172 -m2
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	173 +1
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	174 +a1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	175 +a2
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	176 diff --git a/a b/b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	177 copy from a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	178 copy to b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	179 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	180 +++ b/b
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	181 @@ -1,3 +1,4 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	182 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	183 -m1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	184 -m2
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	185 +1
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	186 +a1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	187 +a2
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	188 diff --git a/x/y b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	189 deleted file mode 100644
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	190 --- a/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	191 +++ /dev/null
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	192 @@ -1,1 +0,0 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	193 -y1
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	194
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	195 - root to parent: --rev 0 --rev .
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	196 M a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	197
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	198 diff --git a/a b/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	199 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	200 +++ b/a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	201 @@ -1,1 +1,4 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	202 a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	203 +1
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	204 +a1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	205 +a2
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	206
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	207 - parent to root: --rev . --rev 0
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	208 M a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	209
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	210 diff --git a/a b/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	211 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	212 +++ b/a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	213 @@ -1,4 +1,1 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	214 a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	215 -1
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	216 -a1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	217 -a2
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	218
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	219 - branch to parent: --rev 2 --rev .
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	220 M a
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	221 R x/y
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	222
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	223 diff --git a/a b/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	224 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	225 +++ b/a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	226 @@ -1,3 +1,4 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	227 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	228 -m1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	229 -m2
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	230 +1
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	231 +a1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	232 +a2
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	233 diff --git a/x/y b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	234 deleted file mode 100644
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	235 --- a/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	236 +++ /dev/null
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	237 @@ -1,1 +0,0 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	238 -y1
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	239
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	240 - parent to branch: --rev . --rev 2
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	241 M a
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	242 A x/y
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	243
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	244 diff --git a/a b/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	245 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	246 +++ b/a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	247 @@ -1,4 +1,3 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	248 a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	249 -1
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	250 -a1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	251 -a2
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	252 +m1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	253 +m2
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	254 diff --git a/x/y b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	255 new file mode 100644
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	256 --- /dev/null
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	257 +++ b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	258 @@ -0,0 +1,1 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	259 +y1
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	260
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	261
9611 a3d73b3e1f8a hg.clone: report branch name on update Adrian Buehlmann <adrian@cadifra.com> parents: 8518 diff changeset	262 updating to branch default
8518 3f4f14eab085 update --clean: do not unlink added files (issue575) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6425 diff changeset	263 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
6336 4b0c9c674707 warn about new heads on commit (issue842) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6286 diff changeset	264 created new head
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	265 single rename
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	266 ** hg mv a b / add b b1 / add b w
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	267 - working to parent:
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	268 M b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	269
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	270 diff --git a/b b/b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	271 --- a/b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	272 +++ b/b
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	273 @@ -1,3 +1,4 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	274 a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	275 2
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	276 b1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	277 +w
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	278
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	279 - working to root: --rev 0
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	280 A b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	281 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	282 R a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	283
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	284 diff --git a/a b/b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	285 rename from a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	286 rename to b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	287 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	288 +++ b/b
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	289 @@ -1,1 +1,4 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	290 a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	291 +2
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	292 +b1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	293 +w
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	294
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	295 - working to branch: --rev 2
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	296 A b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	297 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	298 R a
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	299 R x/y
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	300
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	301 diff --git a/a b/b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	302 rename from a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	303 rename to b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	304 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	305 +++ b/b
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	306 @@ -1,3 +1,4 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	307 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	308 -m1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	309 -m2
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	310 +2
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	311 +b1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	312 +w
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	313 diff --git a/x/y b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	314 deleted file mode 100644
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	315 --- a/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	316 +++ /dev/null
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	317 @@ -1,1 +0,0 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	318 -y1
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	319
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	320 - root to parent: --rev 0 --rev .
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	321 A b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	322 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	323 R a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	324
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	325 diff --git a/a b/b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	326 rename from a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	327 rename to b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	328 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	329 +++ b/b
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	330 @@ -1,1 +1,3 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	331 a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	332 +2
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	333 +b1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	334
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	335 - parent to root: --rev . --rev 0
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	336 A a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	337 b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	338 R b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	339
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	340 diff --git a/b b/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	341 rename from b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	342 rename to a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	343 --- a/b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	344 +++ b/a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	345 @@ -1,3 +1,1 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	346 a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	347 -2
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	348 -b1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	349
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	350 - branch to parent: --rev 2 --rev .
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	351 A b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	352 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	353 R a
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	354 R x/y
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	355
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	356 diff --git a/a b/b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	357 rename from a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	358 rename to b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	359 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	360 +++ b/b
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	361 @@ -1,3 +1,3 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	362 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	363 -m1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	364 -m2
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	365 +2
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	366 +b1
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	367 diff --git a/x/y b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	368 deleted file mode 100644
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	369 --- a/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	370 +++ /dev/null
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	371 @@ -1,1 +0,0 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	372 -y1
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	373
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	374 - parent to branch: --rev . --rev 2
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	375 A a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	376 b
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	377 A x/y
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	378 R b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	379
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	380 diff --git a/b b/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	381 rename from b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	382 rename to a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	383 --- a/b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	384 +++ b/a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	385 @@ -1,3 +1,3 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	386 a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	387 -2
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	388 -b1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	389 +m1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	390 +m2
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	391 diff --git a/x/y b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	392 new file mode 100644
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	393 --- /dev/null
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	394 +++ b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	395 @@ -0,0 +1,1 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	396 +y1
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	397
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	398
9611 a3d73b3e1f8a hg.clone: report branch name on update Adrian Buehlmann <adrian@cadifra.com> parents: 8518 diff changeset	399 updating to branch default
8518 3f4f14eab085 update --clean: do not unlink added files (issue575) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6425 diff changeset	400 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
6336 4b0c9c674707 warn about new heads on commit (issue842) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6286 diff changeset	401 created new head
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	402 single copy
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	403 ** hg cp a b / add b b1 / add a w
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	404 - working to parent:
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	405 M a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	406
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	407 diff --git a/a b/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	408 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	409 +++ b/a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	410 @@ -1,2 +1,3 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	411 a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	412 3
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	413 +w
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	414
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	415 - working to root: --rev 0
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	416 M a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	417 A b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	418 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	419
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	420 diff --git a/a b/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	421 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	422 +++ b/a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	423 @@ -1,1 +1,3 @@
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	424 a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	425 +3
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	426 +w
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	427 diff --git a/a b/b
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	428 copy from a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	429 copy to b
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	430 --- a/a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	431 +++ b/b
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	432 @@ -1,1 +1,3 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	433 a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	434 +3
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	435 +b1
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	436
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	437 - working to branch: --rev 2
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	438 M a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	439 A b
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	440 a
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	441 R x/y
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	442
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	443 diff --git a/a b/a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	444 --- a/a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	445 +++ b/a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	446 @@ -1,3 +1,3 @@
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	447 a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	448 -m1
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	449 -m2
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	450 +3
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	451 +w
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	452 diff --git a/a b/b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	453 copy from a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	454 copy to b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	455 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	456 +++ b/b
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	457 @@ -1,3 +1,3 @@
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	458 a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	459 -m1
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	460 -m2
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	461 +3
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	462 +b1
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	463 diff --git a/x/y b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	464 deleted file mode 100644
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	465 --- a/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	466 +++ /dev/null
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	467 @@ -1,1 +0,0 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	468 -y1
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	469
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	470 - root to parent: --rev 0 --rev .
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	471 M a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	472 A b
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	473 a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	474
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	475 diff --git a/a b/a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	476 --- a/a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	477 +++ b/a
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	478 @@ -1,1 +1,2 @@
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	479 a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	480 +3
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	481 diff --git a/a b/b
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	482 copy from a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	483 copy to b
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	484 --- a/a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	485 +++ b/b
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	486 @@ -1,1 +1,3 @@
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	487 a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	488 +3
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	489 +b1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	490
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	491 - parent to root: --rev . --rev 0
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	492 M a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	493 R b
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	494
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	495 diff --git a/a b/a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	496 --- a/a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	497 +++ b/a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	498 @@ -1,2 +1,1 @@
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	499 a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	500 -3
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	501 diff --git a/b b/b
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	502 deleted file mode 100644
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	503 --- a/b
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	504 +++ /dev/null
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	505 @@ -1,3 +0,0 @@
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	506 -a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	507 -3
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	508 -b1
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	509
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	510 - branch to parent: --rev 2 --rev .
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	511 M a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	512 A b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	513 a
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	514 R x/y
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	515
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	516 diff --git a/a b/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	517 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	518 +++ b/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	519 @@ -1,3 +1,2 @@
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	520 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	521 -m1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	522 -m2
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	523 +3
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	524 diff --git a/a b/b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	525 copy from a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	526 copy to b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	527 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	528 +++ b/b
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	529 @@ -1,3 +1,3 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	530 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	531 -m1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	532 -m2
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	533 +3
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	534 +b1
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	535 diff --git a/x/y b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	536 deleted file mode 100644
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	537 --- a/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	538 +++ /dev/null
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	539 @@ -1,1 +0,0 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	540 -y1
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	541
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	542 - parent to branch: --rev . --rev 2
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	543 M a
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	544 A x/y
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	545 R b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	546
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	547 diff --git a/a b/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	548 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	549 +++ b/a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	550 @@ -1,2 +1,3 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	551 a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	552 -3
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	553 +m1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	554 +m2
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	555 diff --git a/b b/b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	556 deleted file mode 100644
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	557 --- a/b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	558 +++ /dev/null
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	559 @@ -1,3 +0,0 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	560 -a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	561 -3
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	562 -b1
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	563 diff --git a/x/y b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	564 new file mode 100644
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	565 --- /dev/null
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	566 +++ b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	567 @@ -0,0 +1,1 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	568 +y1
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	569
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	570
9611 a3d73b3e1f8a hg.clone: report branch name on update Adrian Buehlmann <adrian@cadifra.com> parents: 8518 diff changeset	571 updating to branch default
8518 3f4f14eab085 update --clean: do not unlink added files (issue575) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6425 diff changeset	572 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
6336 4b0c9c674707 warn about new heads on commit (issue842) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6286 diff changeset	573 created new head
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	574 rename chain
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	575 ** hg mv a b / hg mv b c / hg mv c d
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	576 - working to parent:
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	577 A d
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	578 c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	579 R c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	580
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	581 diff --git a/c b/d
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	582 rename from c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	583 rename to d
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	584
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	585 - working to root: --rev 0
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	586 A d
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	587 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	588 R a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	589
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	590 diff --git a/a b/d
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	591 rename from a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	592 rename to d
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	593 --- a/a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	594 +++ b/d
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	595 @@ -1,1 +1,2 @@
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	596 a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	597 +4
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	598
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	599 - working to branch: --rev 2
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	600 A d
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	601 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	602 R a
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	603 R x/y
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	604
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	605 diff --git a/a b/d
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	606 rename from a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	607 rename to d
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	608 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	609 +++ b/d
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	610 @@ -1,3 +1,2 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	611 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	612 -m1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	613 -m2
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	614 +4
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	615 diff --git a/x/y b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	616 deleted file mode 100644
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	617 --- a/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	618 +++ /dev/null
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	619 @@ -1,1 +0,0 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	620 -y1
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	621
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	622 - root to parent: --rev 0 --rev .
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	623 A c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	624 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	625 R a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	626
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	627 diff --git a/a b/c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	628 rename from a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	629 rename to c
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	630 --- a/a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	631 +++ b/c
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	632 @@ -1,1 +1,2 @@
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	633 a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	634 +4
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	635
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	636 - parent to root: --rev . --rev 0
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	637 A a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	638 c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	639 R c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	640
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	641 diff --git a/c b/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	642 rename from c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	643 rename to a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	644 --- a/c
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	645 +++ b/a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	646 @@ -1,2 +1,1 @@
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	647 a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	648 -4
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	649
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	650 - branch to parent: --rev 2 --rev .
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	651 A c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	652 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	653 R a
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	654 R x/y
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	655
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	656 diff --git a/a b/c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	657 rename from a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	658 rename to c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	659 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	660 +++ b/c
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	661 @@ -1,3 +1,2 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	662 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	663 -m1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	664 -m2
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	665 +4
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	666 diff --git a/x/y b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	667 deleted file mode 100644
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	668 --- a/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	669 +++ /dev/null
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	670 @@ -1,1 +0,0 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	671 -y1
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	672
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	673 - parent to branch: --rev . --rev 2
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	674 A a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	675 c
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	676 A x/y
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	677 R c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	678
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	679 diff --git a/c b/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	680 rename from c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	681 rename to a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	682 --- a/c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	683 +++ b/a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	684 @@ -1,2 +1,3 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	685 a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	686 -4
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	687 +m1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	688 +m2
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	689 diff --git a/x/y b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	690 new file mode 100644
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	691 --- /dev/null
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	692 +++ b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	693 @@ -0,0 +1,1 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	694 +y1
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	695
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	696
9611 a3d73b3e1f8a hg.clone: report branch name on update Adrian Buehlmann <adrian@cadifra.com> parents: 8518 diff changeset	697 updating to branch default
8518 3f4f14eab085 update --clean: do not unlink added files (issue575) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6425 diff changeset	698 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
6336 4b0c9c674707 warn about new heads on commit (issue842) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6286 diff changeset	699 created new head
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	700 copy chain
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	701 ** hg cp a b / hg cp b c / hg cp c d
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	702 - working to parent:
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	703 A d
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	704 c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	705
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	706 diff --git a/c b/d
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	707 copy from c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	708 copy to d
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	709
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	710 - working to root: --rev 0
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	711 M a
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	712 A b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	713 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	714 A c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	715 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	716 A d
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	717 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	718
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	719 diff --git a/a b/a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	720 --- a/a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	721 +++ b/a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	722 @@ -1,1 +1,2 @@
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	723 a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	724 +5
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	725 diff --git a/a b/b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	726 copy from a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	727 copy to b
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	728 --- a/a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	729 +++ b/b
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	730 @@ -1,1 +1,2 @@
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	731 a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	732 +5
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	733 diff --git a/a b/c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	734 copy from a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	735 copy to c
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	736 --- a/a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	737 +++ b/c
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	738 @@ -1,1 +1,2 @@
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	739 a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	740 +5
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	741 diff --git a/a b/d
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	742 copy from a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	743 copy to d
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	744 --- a/a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	745 +++ b/d
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	746 @@ -1,1 +1,2 @@
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	747 a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	748 +5
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	749
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	750 - working to branch: --rev 2
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	751 M a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	752 A b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	753 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	754 A c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	755 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	756 A d
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	757 a
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	758 R x/y
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	759
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	760 diff --git a/a b/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	761 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	762 +++ b/a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	763 @@ -1,3 +1,2 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	764 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	765 -m1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	766 -m2
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	767 +5
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	768 diff --git a/a b/b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	769 copy from a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	770 copy to b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	771 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	772 +++ b/b
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	773 @@ -1,3 +1,2 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	774 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	775 -m1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	776 -m2
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	777 +5
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	778 diff --git a/a b/c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	779 copy from a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	780 copy to c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	781 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	782 +++ b/c
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	783 @@ -1,3 +1,2 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	784 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	785 -m1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	786 -m2
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	787 +5
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	788 diff --git a/a b/d
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	789 copy from a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	790 copy to d
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	791 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	792 +++ b/d
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	793 @@ -1,3 +1,2 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	794 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	795 -m1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	796 -m2
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	797 +5
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	798 diff --git a/x/y b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	799 deleted file mode 100644
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	800 --- a/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	801 +++ /dev/null
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	802 @@ -1,1 +0,0 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	803 -y1
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	804
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	805 - root to parent: --rev 0 --rev .
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	806 M a
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	807 A b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	808 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	809 A c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	810 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	811
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	812 diff --git a/a b/a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	813 --- a/a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	814 +++ b/a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	815 @@ -1,1 +1,2 @@
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	816 a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	817 +5
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	818 diff --git a/a b/b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	819 copy from a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	820 copy to b
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	821 --- a/a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	822 +++ b/b
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	823 @@ -1,1 +1,2 @@
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	824 a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	825 +5
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	826 diff --git a/a b/c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	827 copy from a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	828 copy to c
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	829 --- a/a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	830 +++ b/c
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	831 @@ -1,1 +1,2 @@
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	832 a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	833 +5
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	834
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	835 - parent to root: --rev . --rev 0
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	836 M a
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	837 R b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	838 R c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	839
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	840 diff --git a/a b/a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	841 --- a/a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	842 +++ b/a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	843 @@ -1,2 +1,1 @@
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	844 a
709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	845 -5
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	846 diff --git a/b b/b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	847 deleted file mode 100644
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	848 --- a/b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	849 +++ /dev/null
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	850 @@ -1,2 +0,0 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	851 -a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	852 -5
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	853 diff --git a/c b/c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	854 deleted file mode 100644
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	855 --- a/c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	856 +++ /dev/null
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	857 @@ -1,2 +0,0 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	858 -a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	859 -5
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	860
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	861 - branch to parent: --rev 2 --rev .
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	862 M a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	863 A b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	864 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	865 A c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	866 a
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	867 R x/y
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	868
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	869 diff --git a/a b/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	870 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	871 +++ b/a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	872 @@ -1,3 +1,2 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	873 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	874 -m1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	875 -m2
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	876 +5
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	877 diff --git a/a b/b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	878 copy from a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	879 copy to b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	880 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	881 +++ b/b
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	882 @@ -1,3 +1,2 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	883 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	884 -m1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	885 -m2
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	886 +5
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	887 diff --git a/a b/c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	888 copy from a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	889 copy to c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	890 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	891 +++ b/c
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	892 @@ -1,3 +1,2 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	893 a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	894 -m1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	895 -m2
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	896 +5
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	897 diff --git a/x/y b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	898 deleted file mode 100644
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	899 --- a/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	900 +++ /dev/null
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	901 @@ -1,1 +0,0 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	902 -y1
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	903
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	904 - parent to branch: --rev . --rev 2
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	905 M a
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	906 A x/y
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	907 R b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	908 R c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	909
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	910 diff --git a/a b/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	911 --- a/a
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	912 +++ b/a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	913 @@ -1,2 +1,3 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	914 a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	915 -5
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	916 +m1
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	917 +m2
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	918 diff --git a/b b/b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	919 deleted file mode 100644
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	920 --- a/b
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	921 +++ /dev/null
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	922 @@ -1,2 +0,0 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	923 -a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	924 -5
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	925 diff --git a/c b/c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	926 deleted file mode 100644
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	927 --- a/c
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	928 +++ /dev/null
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	929 @@ -1,2 +0,0 @@
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	930 -a
6282 709652cd7bff test-mv-cp-st-diff: avoid linkrev collisions Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6278 diff changeset	931 -5
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	932 diff --git a/x/y b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	933 new file mode 100644
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	934 --- /dev/null
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	935 +++ b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	936 @@ -0,0 +1,1 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	937 +y1
6278 81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	938
81e7112b07ae copies: add tests for status -C/diff --git Matt Mackall <mpm@selenic.com> parents: diff changeset	939
9611 a3d73b3e1f8a hg.clone: report branch name on update Adrian Buehlmann <adrian@cadifra.com> parents: 8518 diff changeset	940 updating to branch default
8518 3f4f14eab085 update --clean: do not unlink added files (issue575) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6425 diff changeset	941 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
6336 4b0c9c674707 warn about new heads on commit (issue842) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6286 diff changeset	942 created new head
6286 90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	943 circular rename
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	944 ** add a a1 / hg mv a b / hg mv b a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	945 - working to parent:
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	946 A a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	947 b
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	948 R b
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	949
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	950 diff --git a/b b/a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	951 rename from b
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	952 rename to a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	953
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	954 - working to root: --rev 0
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	955 M a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	956
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	957 diff --git a/a b/a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	958 --- a/a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	959 +++ b/a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	960 @@ -1,1 +1,3 @@
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	961 a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	962 +6
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	963 +a1
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	964
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	965 - working to branch: --rev 2
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	966 M a
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	967 R x/y
6286 90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	968
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	969 diff --git a/a b/a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	970 --- a/a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	971 +++ b/a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	972 @@ -1,3 +1,3 @@
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	973 a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	974 -m1
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	975 -m2
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	976 +6
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	977 +a1
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	978 diff --git a/x/y b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	979 deleted file mode 100644
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	980 --- a/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	981 +++ /dev/null
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	982 @@ -1,1 +0,0 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	983 -y1
6286 90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	984
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	985 - root to parent: --rev 0 --rev .
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	986 A b
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	987 a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	988 R a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	989
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	990 diff --git a/a b/b
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	991 rename from a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	992 rename to b
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	993 --- a/a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	994 +++ b/b
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	995 @@ -1,1 +1,3 @@
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	996 a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	997 +6
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	998 +a1
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	999
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1000 - parent to root: --rev . --rev 0
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1001 A a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1002 b
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1003 R b
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1004
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1005 diff --git a/b b/a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1006 rename from b
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1007 rename to a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1008 --- a/b
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1009 +++ b/a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1010 @@ -1,3 +1,1 @@
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1011 a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1012 -6
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1013 -a1
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1014
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1015 - branch to parent: --rev 2 --rev .
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1016 A b
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1017 a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1018 R a
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1019 R x/y
6286 90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1020
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1021 diff --git a/a b/b
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1022 rename from a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1023 rename to b
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1024 --- a/a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1025 +++ b/b
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1026 @@ -1,3 +1,3 @@
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1027 a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1028 -m1
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1029 -m2
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1030 +6
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1031 +a1
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1032 diff --git a/x/y b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1033 deleted file mode 100644
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1034 --- a/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1035 +++ /dev/null
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1036 @@ -1,1 +0,0 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1037 -y1
6286 90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1038
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1039 - parent to branch: --rev . --rev 2
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1040 A a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1041 b
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1042 A x/y
6286 90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1043 R b
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1044
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1045 diff --git a/b b/a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1046 rename from b
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1047 rename to a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1048 --- a/b
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1049 +++ b/a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1050 @@ -1,3 +1,3 @@
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1051 a
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1052 -6
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1053 -a1
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1054 +m1
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1055 +m2
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1056 diff --git a/x/y b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1057 new file mode 100644
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1058 --- /dev/null
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1059 +++ b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1060 @@ -0,0 +1,1 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1061 +y1
6286 90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1062
90a4329a6b4a filectx.ancestor: use fctx._repopath to cache filelogs (issue1035) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6282 diff changeset	1063
9611 a3d73b3e1f8a hg.clone: report branch name on update Adrian Buehlmann <adrian@cadifra.com> parents: 8518 diff changeset	1064 updating to branch default
8518 3f4f14eab085 update --clean: do not unlink added files (issue575) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6425 diff changeset	1065 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
6425 2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1066 created new head
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1067 moving x/x to y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1068 directory move
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1069 ** hg mv x y / add y/x x1 / add y/x x2
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1070 - working to parent:
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1071 M y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1072
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1073 diff --git a/y/x b/y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1074 --- a/y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1075 +++ b/y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1076 @@ -1,2 +1,3 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1077 x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1078 x1
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1079 +x2
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1080
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1081 - working to root: --rev 0
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1082 M a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1083 A y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1084 x/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1085 R x/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1086
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1087 diff --git a/a b/a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1088 --- a/a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1089 +++ b/a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1090 @@ -1,1 +1,2 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1091 a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1092 +7
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1093 diff --git a/x/x b/y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1094 rename from x/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1095 rename to y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1096 --- a/x/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1097 +++ b/y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1098 @@ -1,1 +1,3 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1099 x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1100 +x1
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1101 +x2
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1102
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1103 - working to branch: --rev 2
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1104 M a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1105 A y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1106 x/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1107 R x/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1108 R x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1109
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1110 diff --git a/a b/a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1111 --- a/a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1112 +++ b/a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1113 @@ -1,3 +1,2 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1114 a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1115 -m1
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1116 -m2
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1117 +7
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1118 diff --git a/x/y b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1119 deleted file mode 100644
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1120 --- a/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1121 +++ /dev/null
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1122 @@ -1,1 +0,0 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1123 -y1
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1124 diff --git a/x/x b/y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1125 rename from x/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1126 rename to y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1127 --- a/x/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1128 +++ b/y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1129 @@ -1,1 +1,3 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1130 x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1131 +x1
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1132 +x2
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1133
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1134 - root to parent: --rev 0 --rev .
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1135 M a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1136 A y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1137 x/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1138 R x/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1139
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1140 diff --git a/a b/a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1141 --- a/a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1142 +++ b/a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1143 @@ -1,1 +1,2 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1144 a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1145 +7
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1146 diff --git a/x/x b/y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1147 rename from x/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1148 rename to y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1149 --- a/x/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1150 +++ b/y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1151 @@ -1,1 +1,2 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1152 x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1153 +x1
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1154
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1155 - parent to root: --rev . --rev 0
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1156 M a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1157 A x/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1158 y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1159 R y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1160
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1161 diff --git a/a b/a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1162 --- a/a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1163 +++ b/a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1164 @@ -1,2 +1,1 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1165 a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1166 -7
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1167 diff --git a/y/x b/x/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1168 rename from y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1169 rename to x/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1170 --- a/y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1171 +++ b/x/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1172 @@ -1,2 +1,1 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1173 x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1174 -x1
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1175
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1176 - branch to parent: --rev 2 --rev .
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1177 M a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1178 A y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1179 x/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1180 R x/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1181 R x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1182
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1183 diff --git a/a b/a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1184 --- a/a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1185 +++ b/a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1186 @@ -1,3 +1,2 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1187 a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1188 -m1
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1189 -m2
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1190 +7
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1191 diff --git a/x/y b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1192 deleted file mode 100644
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1193 --- a/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1194 +++ /dev/null
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1195 @@ -1,1 +0,0 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1196 -y1
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1197 diff --git a/x/x b/y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1198 rename from x/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1199 rename to y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1200 --- a/x/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1201 +++ b/y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1202 @@ -1,1 +1,2 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1203 x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1204 +x1
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1205
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1206 - parent to branch: --rev . --rev 2
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1207 M a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1208 A x/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1209 y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1210 A x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1211 R y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1212
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1213 diff --git a/a b/a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1214 --- a/a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1215 +++ b/a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1216 @@ -1,2 +1,3 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1217 a
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1218 -7
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1219 +m1
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1220 +m2
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1221 diff --git a/y/x b/x/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1222 rename from y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1223 rename to x/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1224 --- a/y/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1225 +++ b/x/x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1226 @@ -1,2 +1,1 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1227 x
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1228 -x1
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1229 diff --git a/x/y b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1230 new file mode 100644
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1231 --- /dev/null
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1232 +++ b/x/y
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1233 @@ -0,0 +1,1 @@
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1234 +y1
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1235
2d9328a2f81f copies: skip directory rename checks when not merging Matt Mackall <mpm@selenic.com> parents: 6336 diff changeset	1236
10179 83cfa1baf8ad copies: don't report copies with unrelated branch Patrick Mezard <pmezard@gmail.com> parents: 9611 diff changeset	1237 % testing copies with unrelated branch
83cfa1baf8ad copies: don't report copies with unrelated branch Patrick Mezard <pmezard@gmail.com> parents: 9611 diff changeset	1238 adding a
83cfa1baf8ad copies: don't report copies with unrelated branch Patrick Mezard <pmezard@gmail.com> parents: 9611 diff changeset	1239 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
83cfa1baf8ad copies: don't report copies with unrelated branch Patrick Mezard <pmezard@gmail.com> parents: 9611 diff changeset	1240 adding a
83cfa1baf8ad copies: don't report copies with unrelated branch Patrick Mezard <pmezard@gmail.com> parents: 9611 diff changeset	1241 created new head
83cfa1baf8ad copies: don't report copies with unrelated branch Patrick Mezard <pmezard@gmail.com> parents: 9611 diff changeset	1242 % unrelated branch diff
83cfa1baf8ad copies: don't report copies with unrelated branch Patrick Mezard <pmezard@gmail.com> parents: 9611 diff changeset	1243 diff --git a/a b/a
83cfa1baf8ad copies: don't report copies with unrelated branch Patrick Mezard <pmezard@gmail.com> parents: 9611 diff changeset	1244 deleted file mode 100644
83cfa1baf8ad copies: don't report copies with unrelated branch Patrick Mezard <pmezard@gmail.com> parents: 9611 diff changeset	1245 --- a/a
83cfa1baf8ad copies: don't report copies with unrelated branch Patrick Mezard <pmezard@gmail.com> parents: 9611 diff changeset	1246 +++ /dev/null
83cfa1baf8ad copies: don't report copies with unrelated branch Patrick Mezard <pmezard@gmail.com> parents: 9611 diff changeset	1247 @@ -1,1 +0,0 @@
83cfa1baf8ad copies: don't report copies with unrelated branch Patrick Mezard <pmezard@gmail.com> parents: 9611 diff changeset	1248 -a
83cfa1baf8ad copies: don't report copies with unrelated branch Patrick Mezard <pmezard@gmail.com> parents: 9611 diff changeset	1249 diff --git a/b b/b
83cfa1baf8ad copies: don't report copies with unrelated branch Patrick Mezard <pmezard@gmail.com> parents: 9611 diff changeset	1250 new file mode 100644
83cfa1baf8ad copies: don't report copies with unrelated branch Patrick Mezard <pmezard@gmail.com> parents: 9611 diff changeset	1251 --- /dev/null
83cfa1baf8ad copies: don't report copies with unrelated branch Patrick Mezard <pmezard@gmail.com> parents: 9611 diff changeset	1252 +++ b/b
83cfa1baf8ad copies: don't report copies with unrelated branch Patrick Mezard <pmezard@gmail.com> parents: 9611 diff changeset	1253 @@ -0,0 +1,1 @@
83cfa1baf8ad copies: don't report copies with unrelated branch Patrick Mezard <pmezard@gmail.com> parents: 9611 diff changeset	1254 +a

Mercurial > hg

annotate tests/test-mv-cp-st-diff.out @ 10253:b190a8125b43 stable