Mercurial > hg > mercurial-crew

annotate tests/test-mv-cp-st-diff.t @ 18108:bc694d78d843

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: fix some slash-based Windows failures
author Kevin Bullock <kbullock@ringworld.org>
date Thu, 20 Dec 2012 13:49:31 -0600
parents 8c9a52492d42
children f23dea2b296e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6278
81e7112b07ae copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
1
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
2 $ add()
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
3 > {
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
4 > echo $2 >> $1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
5 > }
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
6 $ hg init t
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
7 $ cd t
6278
81e7112b07ae copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
8
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
9 set up a boring main branch
6278
81e7112b07ae copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
10
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
11 $ add a a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
12 $ hg add a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
13 $ mkdir x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
14 $ add x/x x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
15 $ hg add x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
16 $ hg ci -m0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
17 $ add a m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
18 $ hg ci -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
19 $ add a m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
20 $ add x/y y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
21 $ hg add x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
22 $ hg ci -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
23 $ cd ..
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
24
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
25 $ show()
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
26 > {
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
27 > echo "# $2:"
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
28 > echo
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
29 > echo "% hg st -C $1"
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
30 > hg st -C $1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
31 > echo
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
32 > echo "% hg diff --git $1"
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
33 > hg diff --git $1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
34 > echo
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
35 > }
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
36 $ count=0
6278
81e7112b07ae copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
37
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
38 make a new branch and get diff/status output
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
39 $1 - first commit
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
40 $2 - second commit
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
41 $3 - working dir action
6278
81e7112b07ae copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
42
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
43 $ tb()
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
44 > {
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
45 > hg clone -q t t2 ; cd t2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
46 > hg co -q -C 0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
47 >
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
48 > echo % add a $count
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
49 > add a $count
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
50 > count=`expr $count + 1`
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
51 > echo % hg ci -m "t0"
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
52 > hg ci -m "t0"
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
53 > echo % $1
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
54 > $1
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
55 > echo % hg ci -m "t1"
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
56 > hg ci -m "t1"
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
57 > echo % $2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
58 > $2
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
59 > echo % hg ci -m "t2"
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
60 > hg ci -m "t2"
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
61 > echo % $3
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
62 > $3
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
63 > echo
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
64 > show "" "working to parent"
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
65 > show "--rev 0" "working to root"
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
66 > show "--rev 2" "working to branch"
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
67 > show "--rev 0 --rev ." "root to parent"
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
68 > show "--rev . --rev 0" "parent to root"
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
69 > show "--rev 2 --rev ." "branch to parent"
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
70 > show "--rev . --rev 2" "parent to branch"
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
71 > echo
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
72 > cd ..
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
73 > rm -rf t2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
74 > }
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
75
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
76 rename in working dir
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
77
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
78 $ tb "add a a1" "add a a2" "hg mv a b"
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
79 % add a 0
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
80 % hg ci -m t0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
81 created new head
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
82 % add a a1
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
83 % hg ci -m t1
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
84 % add a a2
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
85 % hg ci -m t2
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
86 % hg mv a b
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
87
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
88 # working to parent:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
89
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
90 % hg st -C
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
91 A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
92 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
93 R a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
94
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
95 % hg diff --git
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
96 diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
97 rename from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
98 rename to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
99
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
100 # working to root:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
101
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
102 % hg st -C --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
103 A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
104 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
105 R a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
106
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
107 % hg diff --git --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
108 diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
109 rename from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
110 rename to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
111 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
112 +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
113 @@ -1,1 +1,4 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
114 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
115 +0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
116 +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
117 +a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
118
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
119 # working to branch:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
120
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
121 % hg st -C --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
122 A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
123 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
124 R a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
125 R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
126
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
127 % hg diff --git --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
128 diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
129 rename from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
130 rename to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
131 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
132 +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
133 @@ -1,3 +1,4 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
134 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
135 -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
136 -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
137 +0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
138 +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
139 +a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
140 diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
141 deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
142 --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
143 +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
144 @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
145 -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
146
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
147 # root to parent:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
148
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
149 % hg st -C --rev 0 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
150 M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
151
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
152 % hg diff --git --rev 0 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
153 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
154 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
155 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
156 @@ -1,1 +1,4 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
157 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
158 +0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
159 +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
160 +a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
161
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
162 # parent to root:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
163
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
164 % hg st -C --rev . --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
165 M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
166
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
167 % hg diff --git --rev . --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
168 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
169 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
170 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
171 @@ -1,4 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
172 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
173 -0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
174 -a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
175 -a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
176
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
177 # branch to parent:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
178
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
179 % hg st -C --rev 2 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
180 M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
181 R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
182
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
183 % hg diff --git --rev 2 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
184 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
185 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
186 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
187 @@ -1,3 +1,4 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
188 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
189 -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
190 -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
191 +0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
192 +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
193 +a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
194 diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
195 deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
196 --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
197 +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
198 @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
199 -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
200
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
201 # parent to branch:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
202
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
203 % hg st -C --rev . --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
204 M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
205 A x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
206
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
207 % hg diff --git --rev . --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
208 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
209 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
210 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
211 @@ -1,4 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
212 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
213 -0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
214 -a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
215 -a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
216 +m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
217 +m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
218 diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
219 new file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
220 --- /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
221 +++ b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
222 @@ -0,0 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
223 +y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
224
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
225
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
226 copy in working dir
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
227
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
228 $ tb "add a a1" "add a a2" "hg cp a b"
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
229 % add a 1
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
230 % hg ci -m t0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
231 created new head
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
232 % add a a1
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
233 % hg ci -m t1
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
234 % add a a2
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
235 % hg ci -m t2
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
236 % hg cp a b
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
237
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
238 # working to parent:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
239
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
240 % hg st -C
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
241 A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
242 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
243
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
244 % hg diff --git
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
245 diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
246 copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
247 copy to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
248
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
249 # working to root:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
250
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
251 % hg st -C --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
252 M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
253 A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
254 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
255
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
256 % hg diff --git --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
257 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
258 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
259 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
260 @@ -1,1 +1,4 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
261 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
262 +1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
263 +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
264 +a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
265 diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
266 copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
267 copy to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
268 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
269 +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
270 @@ -1,1 +1,4 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
271 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
272 +1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
273 +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
274 +a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
275
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
276 # working to branch:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
277
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
278 % hg st -C --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
279 M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
280 A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
281 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
282 R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
283
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
284 % hg diff --git --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
285 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
286 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
287 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
288 @@ -1,3 +1,4 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
289 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
290 -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
291 -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
292 +1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
293 +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
294 +a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
295 diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
296 copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
297 copy to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
298 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
299 +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
300 @@ -1,3 +1,4 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
301 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
302 -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
303 -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
304 +1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
305 +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
306 +a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
307 diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
308 deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
309 --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
310 +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
311 @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
312 -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
313
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
314 # root to parent:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
315
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
316 % hg st -C --rev 0 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
317 M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
318
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
319 % hg diff --git --rev 0 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
320 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
321 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
322 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
323 @@ -1,1 +1,4 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
324 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
325 +1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
326 +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
327 +a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
328
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
329 # parent to root:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
330
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
331 % hg st -C --rev . --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
332 M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
333
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
334 % hg diff --git --rev . --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
335 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
336 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
337 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
338 @@ -1,4 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
339 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
340 -1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
341 -a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
342 -a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
343
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
344 # branch to parent:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
345
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
346 % hg st -C --rev 2 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
347 M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
348 R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
349
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
350 % hg diff --git --rev 2 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
351 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
352 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
353 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
354 @@ -1,3 +1,4 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
355 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
356 -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
357 -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
358 +1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
359 +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
360 +a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
361 diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
362 deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
363 --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
364 +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
365 @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
366 -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
367
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
368 # parent to branch:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
369
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
370 % hg st -C --rev . --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
371 M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
372 A x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
373
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
374 % hg diff --git --rev . --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
375 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
376 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
377 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
378 @@ -1,4 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
379 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
380 -1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
381 -a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
382 -a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
383 +m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
384 +m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
385 diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
386 new file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
387 --- /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
388 +++ b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
389 @@ -0,0 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
390 +y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
391
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
392
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
393 single rename
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
394
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
395 $ tb "hg mv a b" "add b b1" "add b w"
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
396 % add a 2
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
397 % hg ci -m t0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
398 created new head
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
399 % hg mv a b
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
400 % hg ci -m t1
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
401 % add b b1
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
402 % hg ci -m t2
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
403 % add b w
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
404
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
405 # working to parent:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
406
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
407 % hg st -C
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
408 M b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
409
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
410 % hg diff --git
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
411 diff --git a/b b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
412 --- a/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
413 +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
414 @@ -1,3 +1,4 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
415 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
416 2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
417 b1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
418 +w
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
419
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
420 # working to root:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
421
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
422 % hg st -C --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
423 A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
424 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
425 R a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
426
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
427 % hg diff --git --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
428 diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
429 rename from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
430 rename to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
431 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
432 +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
433 @@ -1,1 +1,4 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
434 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
435 +2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
436 +b1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
437 +w
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
438
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
439 # working to branch:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
440
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
441 % hg st -C --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
442 A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
443 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
444 R a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
445 R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
446
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
447 % hg diff --git --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
448 diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
449 rename from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
450 rename to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
451 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
452 +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
453 @@ -1,3 +1,4 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
454 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
455 -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
456 -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
457 +2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
458 +b1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
459 +w
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
460 diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
461 deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
462 --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
463 +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
464 @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
465 -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
466
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
467 # root to parent:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
468
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
469 % hg st -C --rev 0 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
470 A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
471 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
472 R a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
473
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
474 % hg diff --git --rev 0 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
475 diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
476 rename from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
477 rename to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
478 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
479 +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
480 @@ -1,1 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
481 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
482 +2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
483 +b1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
484
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
485 # parent to root:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
486
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
487 % hg st -C --rev . --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
488 A a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
489 b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
490 R b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
491
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
492 % hg diff --git --rev . --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
493 diff --git a/b b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
494 rename from b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
495 rename to a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
496 --- a/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
497 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
498 @@ -1,3 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
499 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
500 -2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
501 -b1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
502
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
503 # branch to parent:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
504
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
505 % hg st -C --rev 2 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
506 A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
507 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
508 R a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
509 R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
510
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
511 % hg diff --git --rev 2 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
512 diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
513 rename from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
514 rename to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
515 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
516 +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
517 @@ -1,3 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
518 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
519 -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
520 -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
521 +2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
522 +b1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
523 diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
524 deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
525 --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
526 +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
527 @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
528 -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
529
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
530 # parent to branch:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
531
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
532 % hg st -C --rev . --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
533 A a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
534 b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
535 A x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
536 R b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
537
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
538 % hg diff --git --rev . --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
539 diff --git a/b b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
540 rename from b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
541 rename to a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
542 --- a/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
543 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
544 @@ -1,3 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
545 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
546 -2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
547 -b1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
548 +m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
549 +m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
550 diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
551 new file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
552 --- /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
553 +++ b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
554 @@ -0,0 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
555 +y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
556
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
557
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
558 single copy
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
559
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
560 $ tb "hg cp a b" "add b b1" "add a w"
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
561 % add a 3
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
562 % hg ci -m t0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
563 created new head
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
564 % hg cp a b
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
565 % hg ci -m t1
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
566 % add b b1
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
567 % hg ci -m t2
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
568 % add a w
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
569
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
570 # working to parent:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
571
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
572 % hg st -C
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
573 M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
574
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
575 % hg diff --git
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
576 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
577 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
578 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
579 @@ -1,2 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
580 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
581 3
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
582 +w
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
583
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
584 # working to root:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
585
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
586 % hg st -C --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
587 M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
588 A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
589 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
590
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
591 % hg diff --git --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
592 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
593 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
594 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
595 @@ -1,1 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
596 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
597 +3
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
598 +w
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
599 diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
600 copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
601 copy to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
602 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
603 +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
604 @@ -1,1 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
605 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
606 +3
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
607 +b1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
608
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
609 # working to branch:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
610
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
611 % hg st -C --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
612 M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
613 A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
614 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
615 R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
616
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
617 % hg diff --git --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
618 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
619 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
620 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
621 @@ -1,3 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
622 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
623 -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
624 -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
625 +3
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
626 +w
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
627 diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
628 copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
629 copy to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
630 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
631 +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
632 @@ -1,3 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
633 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
634 -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
635 -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
636 +3
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
637 +b1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
638 diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
639 deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
640 --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
641 +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
642 @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
643 -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
644
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
645 # root to parent:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
646
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
647 % hg st -C --rev 0 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
648 M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
649 A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
650 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
651
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
652 % hg diff --git --rev 0 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
653 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
654 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
655 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
656 @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
657 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
658 +3
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
659 diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
660 copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
661 copy to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
662 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
663 +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
664 @@ -1,1 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
665 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
666 +3
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
667 +b1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
668
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
669 # parent to root:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
670
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
671 % hg st -C --rev . --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
672 M a
15775
91eb4512edd0 copies: rewrite copy detection for non-merge users
Matt Mackall <mpm@selenic.com>
parents: 15447
diff changeset
673 b
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
674 R b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
675
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
676 % hg diff --git --rev . --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
677 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
678 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
679 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
680 @@ -1,2 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
681 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
682 -3
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
683 diff --git a/b b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
684 deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
685 --- a/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
686 +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
687 @@ -1,3 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
688 -a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
689 -3
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
690 -b1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
691
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
692 # branch to parent:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
693
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
694 % hg st -C --rev 2 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
695 M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
696 A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
697 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
698 R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
699
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
700 % hg diff --git --rev 2 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
701 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
702 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
703 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
704 @@ -1,3 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
705 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
706 -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
707 -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
708 +3
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
709 diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
710 copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
711 copy to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
712 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
713 +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
714 @@ -1,3 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
715 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
716 -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
717 -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
718 +3
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
719 +b1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
720 diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
721 deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
722 --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
723 +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
724 @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
725 -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
726
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
727 # parent to branch:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
728
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
729 % hg st -C --rev . --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
730 M a
15775
91eb4512edd0 copies: rewrite copy detection for non-merge users
Matt Mackall <mpm@selenic.com>
parents: 15447
diff changeset
731 b
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
732 A x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
733 R b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
734
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
735 % hg diff --git --rev . --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
736 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
737 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
738 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
739 @@ -1,2 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
740 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
741 -3
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
742 +m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
743 +m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
744 diff --git a/b b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
745 deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
746 --- a/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
747 +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
748 @@ -1,3 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
749 -a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
750 -3
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
751 -b1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
752 diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
753 new file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
754 --- /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
755 +++ b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
756 @@ -0,0 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
757 +y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
758
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
759
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
760 rename chain
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
761
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
762 $ tb "hg mv a b" "hg mv b c" "hg mv c d"
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
763 % add a 4
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
764 % hg ci -m t0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
765 created new head
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
766 % hg mv a b
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
767 % hg ci -m t1
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
768 % hg mv b c
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
769 % hg ci -m t2
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
770 % hg mv c d
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
771
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
772 # working to parent:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
773
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
774 % hg st -C
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
775 A d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
776 c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
777 R c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
778
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
779 % hg diff --git
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
780 diff --git a/c b/d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
781 rename from c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
782 rename to d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
783
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
784 # working to root:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
785
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
786 % hg st -C --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
787 A d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
788 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
789 R a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
790
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
791 % hg diff --git --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
792 diff --git a/a b/d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
793 rename from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
794 rename to d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
795 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
796 +++ b/d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
797 @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
798 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
799 +4
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
800
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
801 # working to branch:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
802
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
803 % hg st -C --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
804 A d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
805 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
806 R a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
807 R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
808
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
809 % hg diff --git --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
810 diff --git a/a b/d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
811 rename from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
812 rename to d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
813 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
814 +++ b/d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
815 @@ -1,3 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
816 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
817 -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
818 -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
819 +4
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
820 diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
821 deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
822 --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
823 +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
824 @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
825 -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
826
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
827 # root to parent:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
828
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
829 % hg st -C --rev 0 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
830 A c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
831 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
832 R a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
833
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
834 % hg diff --git --rev 0 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
835 diff --git a/a b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
836 rename from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
837 rename to c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
838 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
839 +++ b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
840 @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
841 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
842 +4
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
843
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
844 # parent to root:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
845
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
846 % hg st -C --rev . --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
847 A a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
848 c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
849 R c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
850
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
851 % hg diff --git --rev . --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
852 diff --git a/c b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
853 rename from c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
854 rename to a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
855 --- a/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
856 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
857 @@ -1,2 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
858 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
859 -4
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
860
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
861 # branch to parent:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
862
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
863 % hg st -C --rev 2 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
864 A c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
865 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
866 R a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
867 R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
868
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
869 % hg diff --git --rev 2 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
870 diff --git a/a b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
871 rename from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
872 rename to c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
873 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
874 +++ b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
875 @@ -1,3 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
876 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
877 -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
878 -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
879 +4
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
880 diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
881 deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
882 --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
883 +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
884 @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
885 -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
886
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
887 # parent to branch:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
888
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
889 % hg st -C --rev . --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
890 A a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
891 c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
892 A x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
893 R c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
894
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
895 % hg diff --git --rev . --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
896 diff --git a/c b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
897 rename from c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
898 rename to a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
899 --- a/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
900 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
901 @@ -1,2 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
902 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
903 -4
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
904 +m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
905 +m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
906 diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
907 new file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
908 --- /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
909 +++ b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
910 @@ -0,0 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
911 +y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
912
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
913
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
914 copy chain
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
915
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
916 $ tb "hg cp a b" "hg cp b c" "hg cp c d"
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
917 % add a 5
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
918 % hg ci -m t0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
919 created new head
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
920 % hg cp a b
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
921 % hg ci -m t1
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
922 % hg cp b c
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
923 % hg ci -m t2
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
924 % hg cp c d
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
925
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
926 # working to parent:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
927
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
928 % hg st -C
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
929 A d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
930 c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
931
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
932 % hg diff --git
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
933 diff --git a/c b/d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
934 copy from c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
935 copy to d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
936
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
937 # working to root:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
938
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
939 % hg st -C --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
940 M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
941 A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
942 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
943 A c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
944 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
945 A d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
946 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
947
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
948 % hg diff --git --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
949 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
950 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
951 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
952 @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
953 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
954 +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
955 diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
956 copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
957 copy to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
958 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
959 +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
960 @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
961 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
962 +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
963 diff --git a/a b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
964 copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
965 copy to c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
966 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
967 +++ b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
968 @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
969 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
970 +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
971 diff --git a/a b/d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
972 copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
973 copy to d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
974 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
975 +++ b/d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
976 @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
977 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
978 +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
979
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
980 # working to branch:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
981
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
982 % hg st -C --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
983 M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
984 A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
985 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
986 A c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
987 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
988 A d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
989 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
990 R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
991
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
992 % hg diff --git --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
993 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
994 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
995 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
996 @@ -1,3 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
997 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
998 -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
999 -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1000 +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1001 diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1002 copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1003 copy to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1004 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1005 +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1006 @@ -1,3 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1007 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1008 -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1009 -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1010 +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1011 diff --git a/a b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1012 copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1013 copy to c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1014 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1015 +++ b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1016 @@ -1,3 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1017 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1018 -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1019 -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1020 +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1021 diff --git a/a b/d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1022 copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1023 copy to d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1024 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1025 +++ b/d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1026 @@ -1,3 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1027 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1028 -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1029 -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1030 +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1031 diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1032 deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1033 --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1034 +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1035 @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1036 -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1037
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1038 # root to parent:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1039
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1040 % hg st -C --rev 0 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1041 M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1042 A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1043 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1044 A c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1045 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1046
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1047 % hg diff --git --rev 0 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1048 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1049 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1050 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1051 @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1052 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1053 +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1054 diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1055 copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1056 copy to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1057 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1058 +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1059 @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1060 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1061 +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1062 diff --git a/a b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1063 copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1064 copy to c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1065 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1066 +++ b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1067 @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1068 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1069 +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1070
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1071 # parent to root:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1072
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1073 % hg st -C --rev . --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1074 M a
15775
91eb4512edd0 copies: rewrite copy detection for non-merge users
Matt Mackall <mpm@selenic.com>
parents: 15447
diff changeset
1075 b
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1076 R b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1077 R c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1078
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1079 % hg diff --git --rev . --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1080 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1081 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1082 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1083 @@ -1,2 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1084 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1085 -5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1086 diff --git a/b b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1087 deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1088 --- a/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1089 +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1090 @@ -1,2 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1091 -a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1092 -5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1093 diff --git a/c b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1094 deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1095 --- a/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1096 +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1097 @@ -1,2 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1098 -a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1099 -5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1100
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1101 # branch to parent:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1102
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1103 % hg st -C --rev 2 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1104 M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1105 A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1106 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1107 A c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1108 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1109 R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1110
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1111 % hg diff --git --rev 2 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1112 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1113 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1114 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1115 @@ -1,3 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1116 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1117 -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1118 -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1119 +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1120 diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1121 copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1122 copy to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1123 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1124 +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1125 @@ -1,3 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1126 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1127 -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1128 -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1129 +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1130 diff --git a/a b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1131 copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1132 copy to c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1133 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1134 +++ b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1135 @@ -1,3 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1136 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1137 -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1138 -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1139 +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1140 diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1141 deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1142 --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1143 +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1144 @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1145 -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1146
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1147 # parent to branch:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1148
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1149 % hg st -C --rev . --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1150 M a
15775
91eb4512edd0 copies: rewrite copy detection for non-merge users
Matt Mackall <mpm@selenic.com>
parents: 15447
diff changeset
1151 b
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1152 A x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1153 R b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1154 R c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1155
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1156 % hg diff --git --rev . --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1157 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1158 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1159 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1160 @@ -1,2 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1161 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1162 -5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1163 +m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1164 +m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1165 diff --git a/b b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1166 deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1167 --- a/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1168 +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1169 @@ -1,2 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1170 -a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1171 -5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1172 diff --git a/c b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1173 deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1174 --- a/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1175 +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1176 @@ -1,2 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1177 -a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1178 -5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1179 diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1180 new file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1181 --- /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1182 +++ b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1183 @@ -0,0 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1184 +y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1185
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1186
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1187 circular rename
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1188
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1189 $ tb "add a a1" "hg mv a b" "hg mv b a"
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1190 % add a 6
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1191 % hg ci -m t0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1192 created new head
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1193 % add a a1
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1194 % hg ci -m t1
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1195 % hg mv a b
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1196 % hg ci -m t2
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1197 % hg mv b a
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1198
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1199 # working to parent:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1200
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1201 % hg st -C
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1202 A a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1203 b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1204 R b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1205
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1206 % hg diff --git
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1207 diff --git a/b b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1208 rename from b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1209 rename to a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1210
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1211 # working to root:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1212
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1213 % hg st -C --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1214 M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1215
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1216 % hg diff --git --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1217 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1218 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1219 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1220 @@ -1,1 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1221 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1222 +6
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1223 +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1224
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1225 # working to branch:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1226
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1227 % hg st -C --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1228 M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1229 R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1230
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1231 % hg diff --git --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1232 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1233 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1234 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1235 @@ -1,3 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1236 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1237 -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1238 -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1239 +6
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1240 +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1241 diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1242 deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1243 --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1244 +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1245 @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1246 -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1247
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1248 # root to parent:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1249
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1250 % hg st -C --rev 0 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1251 A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1252 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1253 R a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1254
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1255 % hg diff --git --rev 0 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1256 diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1257 rename from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1258 rename to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1259 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1260 +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1261 @@ -1,1 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1262 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1263 +6
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1264 +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1265
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1266 # parent to root:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1267
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1268 % hg st -C --rev . --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1269 A a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1270 b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1271 R b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1272
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1273 % hg diff --git --rev . --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1274 diff --git a/b b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1275 rename from b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1276 rename to a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1277 --- a/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1278 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1279 @@ -1,3 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1280 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1281 -6
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1282 -a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1283
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1284 # branch to parent:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1285
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1286 % hg st -C --rev 2 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1287 A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1288 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1289 R a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1290 R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1291
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1292 % hg diff --git --rev 2 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1293 diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1294 rename from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1295 rename to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1296 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1297 +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1298 @@ -1,3 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1299 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1300 -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1301 -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1302 +6
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1303 +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1304 diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1305 deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1306 --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1307 +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1308 @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1309 -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1310
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1311 # parent to branch:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1312
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1313 % hg st -C --rev . --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1314 A a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1315 b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1316 A x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1317 R b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1318
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1319 % hg diff --git --rev . --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1320 diff --git a/b b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1321 rename from b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1322 rename to a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1323 --- a/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1324 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1325 @@ -1,3 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1326 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1327 -6
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1328 -a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1329 +m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1330 +m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1331 diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1332 new file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1333 --- /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1334 +++ b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1335 @@ -0,0 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1336 +y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1337
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1338
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1339 directory move
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1340
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1341 $ tb "hg mv x y" "add y/x x1" "add y/x x2"
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1342 % add a 7
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1343 % hg ci -m t0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1344 created new head
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1345 % hg mv x y
18108
bc694d78d843 tests: fix some slash-based Windows failures
Kevin Bullock <kbullock@ringworld.org>
parents: 18074
diff changeset
1346 moving x/x to y/x (glob)
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1347 % hg ci -m t1
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1348 % add y/x x1
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1349 % hg ci -m t2
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1350 % add y/x x2
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1351
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1352 # working to parent:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1353
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1354 % hg st -C
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1355 M y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1356
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1357 % hg diff --git
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1358 diff --git a/y/x b/y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1359 --- a/y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1360 +++ b/y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1361 @@ -1,2 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1362 x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1363 x1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1364 +x2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1365
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1366 # working to root:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1367
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1368 % hg st -C --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1369 M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1370 A y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1371 x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1372 R x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1373
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1374 % hg diff --git --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1375 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1376 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1377 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1378 @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1379 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1380 +7
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1381 diff --git a/x/x b/y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1382 rename from x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1383 rename to y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1384 --- a/x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1385 +++ b/y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1386 @@ -1,1 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1387 x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1388 +x1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1389 +x2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1390
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1391 # working to branch:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1392
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1393 % hg st -C --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1394 M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1395 A y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1396 x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1397 R x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1398 R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1399
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1400 % hg diff --git --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1401 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1402 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1403 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1404 @@ -1,3 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1405 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1406 -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1407 -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1408 +7
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1409 diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1410 deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1411 --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1412 +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1413 @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1414 -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1415 diff --git a/x/x b/y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1416 rename from x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1417 rename to y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1418 --- a/x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1419 +++ b/y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1420 @@ -1,1 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1421 x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1422 +x1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1423 +x2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1424
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1425 # root to parent:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1426
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1427 % hg st -C --rev 0 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1428 M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1429 A y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1430 x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1431 R x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1432
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1433 % hg diff --git --rev 0 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1434 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1435 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1436 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1437 @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1438 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1439 +7
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1440 diff --git a/x/x b/y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1441 rename from x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1442 rename to y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1443 --- a/x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1444 +++ b/y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1445 @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1446 x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1447 +x1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1448
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1449 # parent to root:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1450
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1451 % hg st -C --rev . --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1452 M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1453 A x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1454 y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1455 R y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1456
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1457 % hg diff --git --rev . --rev 0
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1458 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1459 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1460 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1461 @@ -1,2 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1462 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1463 -7
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1464 diff --git a/y/x b/x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1465 rename from y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1466 rename to x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1467 --- a/y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1468 +++ b/x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1469 @@ -1,2 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1470 x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1471 -x1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1472
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1473 # branch to parent:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1474
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1475 % hg st -C --rev 2 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1476 M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1477 A y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1478 x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1479 R x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1480 R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1481
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1482 % hg diff --git --rev 2 --rev .
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1483 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1484 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1485 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1486 @@ -1,3 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1487 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1488 -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1489 -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1490 +7
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1491 diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1492 deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1493 --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1494 +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1495 @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1496 -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1497 diff --git a/x/x b/y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1498 rename from x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1499 rename to y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1500 --- a/x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1501 +++ b/y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1502 @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1503 x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1504 +x1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1505
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1506 # parent to branch:
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1507
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1508 % hg st -C --rev . --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1509 M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1510 A x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1511 y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1512 A x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1513 R y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1514
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1515 % hg diff --git --rev . --rev 2
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1516 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1517 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1518 +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1519 @@ -1,2 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1520 a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1521 -7
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1522 +m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1523 +m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1524 diff --git a/y/x b/x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1525 rename from y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1526 rename to x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1527 --- a/y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1528 +++ b/x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1529 @@ -1,2 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1530 x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1531 -x1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1532 diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1533 new file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1534 --- /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1535 +++ b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1536 @@ -0,0 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1537 +y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1538
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1539
6425
2d9328a2f81f copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents: 6286
diff changeset
1540
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1541 Cannot implement unrelated branch with tb
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1542 testing copies with unrelated branch
6425
2d9328a2f81f copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents: 6286
diff changeset
1543
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1544 $ hg init unrelated
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1545 $ cd unrelated
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1546 $ echo a >> a
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1547 $ hg ci -Am adda
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1548 adding a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1549 $ hg mv a b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1550 $ hg ci -m movea
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1551 $ hg up -C null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1552 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
18074
8c9a52492d42 tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
1553 $ echo a >> a
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1554 $ hg ci -Am addunrelateda
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1555 adding a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1556 created new head
10174
83cfa1baf8ad copies: don't report copies with unrelated branch
Patrick Mezard <pmezard@gmail.com>
parents: 8518
diff changeset
1557
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1558 unrelated branch diff
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1559
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1560 $ hg diff --git -r 2 -r 1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1561 diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1562 deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1563 --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1564 +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1565 @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1566 -a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1567 diff --git a/b b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1568 new file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1569 --- /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1570 +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1571 @@ -0,0 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1572 +a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10174
diff changeset
1573 $ cd ..