Mercurial > hg
annotate tests/test-mv-cp-st-diff.t @ 28573:6a42564081cb
shelve: adds restoring newly created branch (issue5048) (BC)
Before this patch shelve never preserved branch information,
so after applying unshelve branch was the same as it was
on working copy no matter in which branch shelve took place.
This patch makes bare shelving(with no files specified, without
interactive,include and exclude option) remembers information if
the working directory was on newly created branch ,in other words
working directory was on different branch than its first parent.
In this situation unshelving restores branch information to the working
directory.
author | liscju <piotr.listkiewicz@gmail.com> |
---|---|
date | Wed, 10 Feb 2016 02:23:27 +0100 |
parents | c48924787eaa |
children | 4441705b7111 |
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:
10179
diff
changeset
|
2 $ add() |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
3 > { |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
4 > echo $2 >> $1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
5 > } |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
6 $ hg init t |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
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:
10179
diff
changeset
|
11 $ add a a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
12 $ hg add a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
13 $ mkdir x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
14 $ add x/x x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
15 $ hg add x/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
16 $ hg ci -m0 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
17 $ add a m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
18 $ hg ci -m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
19 $ add a m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
20 $ add x/y y1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
21 $ hg add x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
22 $ hg ci -m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
25 $ show() |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
30 > hg st -C $1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
33 > hg diff --git $1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
34 > echo |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
35 > } |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
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:
10179
diff
changeset
|
39 $1 - first commit |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
40 $2 - second commit |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
43 $ tb() |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
46 > hg co -q -C 0 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
49 > add a $count |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
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:
10179
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:
10179
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:
10179
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:
10179
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:
10179
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:
10179
diff
changeset
|
64 > show "" "working to parent" |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
65 > show "--rev 0" "working to root" |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
66 > show "--rev 2" "working to branch" |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
67 > show "--rev 0 --rev ." "root to parent" |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
68 > show "--rev . --rev 0" "parent to root" |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
69 > show "--rev 2 --rev ." "branch to parent" |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
70 > show "--rev . --rev 2" "parent to branch" |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
71 > echo |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
72 > cd .. |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
73 > rm -rf t2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
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:
10179
diff
changeset
|
91 A b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
92 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
93 R a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
96 diff --git a/a b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
97 rename from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
98 rename to b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
103 A b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
104 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
105 R a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
108 diff --git a/a b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
109 rename from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
110 rename to b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
111 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
112 +++ b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
113 @@ -1,1 +1,4 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
114 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
115 +0 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
116 +a1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
117 +a2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
122 A b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
123 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
124 R a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
125 R x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
128 diff --git a/a b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
129 rename from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
130 rename to b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
131 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
132 +++ b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
133 @@ -1,3 +1,4 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
134 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
135 -m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
136 -m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
137 +0 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
138 +a1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
139 +a2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
141 deleted file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
142 --- a/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
143 +++ /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
144 @@ -1,1 +0,0 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
145 -y1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
150 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
153 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
154 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
155 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
156 @@ -1,1 +1,4 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
157 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
158 +0 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
159 +a1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
160 +a2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
165 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
168 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
169 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
170 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
171 @@ -1,4 +1,1 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
172 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
173 -0 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
174 -a1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
175 -a2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
180 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
181 R x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
184 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
185 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
186 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
187 @@ -1,3 +1,4 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
188 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
189 -m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
190 -m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
191 +0 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
192 +a1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
193 +a2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
195 deleted file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
196 --- a/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
197 +++ /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
198 @@ -1,1 +0,0 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
199 -y1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
204 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
205 A x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
208 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
209 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
210 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
211 @@ -1,4 +1,3 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
212 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
213 -0 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
214 -a1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
215 -a2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
216 +m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
217 +m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
219 new file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
220 --- /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
221 +++ b/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
222 @@ -0,0 +1,1 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
223 +y1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
224 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
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:
10179
diff
changeset
|
241 A b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
242 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
245 diff --git a/a b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
246 copy from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
247 copy to b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
252 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
253 A b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
254 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
257 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
258 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
259 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
260 @@ -1,1 +1,4 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
261 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
262 +1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
263 +a1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
264 +a2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
265 diff --git a/a b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
266 copy from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
267 copy to b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
268 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
269 +++ b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
270 @@ -1,1 +1,4 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
271 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
272 +1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
273 +a1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
274 +a2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
279 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
280 A b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
281 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
282 R x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
285 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
286 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
287 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
288 @@ -1,3 +1,4 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
289 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
290 -m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
291 -m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
292 +1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
293 +a1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
294 +a2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
295 diff --git a/a b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
296 copy from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
297 copy to b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
298 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
299 +++ b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
300 @@ -1,3 +1,4 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
301 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
302 -m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
303 -m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
304 +1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
305 +a1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
306 +a2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
308 deleted file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
309 --- a/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
310 +++ /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
311 @@ -1,1 +0,0 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
312 -y1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
317 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
320 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
321 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
322 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
323 @@ -1,1 +1,4 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
324 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
325 +1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
326 +a1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
327 +a2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
332 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
335 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
336 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
337 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
338 @@ -1,4 +1,1 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
339 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
340 -1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
341 -a1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
342 -a2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
347 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
348 R x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
351 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
352 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
353 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
354 @@ -1,3 +1,4 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
355 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
356 -m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
357 -m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
358 +1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
359 +a1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
360 +a2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
362 deleted file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
363 --- a/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
364 +++ /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
365 @@ -1,1 +0,0 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
366 -y1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
371 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
372 A x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
375 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
376 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
377 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
378 @@ -1,4 +1,3 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
379 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
380 -1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
381 -a1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
382 -a2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
383 +m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
384 +m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
386 new file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
387 --- /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
388 +++ b/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
389 @@ -0,0 +1,1 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
390 +y1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
391 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
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:
10179
diff
changeset
|
408 M b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
411 diff --git a/b b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
412 --- a/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
413 +++ b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
414 @@ -1,3 +1,4 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
415 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
416 2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
417 b1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
418 +w |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
423 A b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
424 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
425 R a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
428 diff --git a/a b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
429 rename from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
430 rename to b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
431 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
432 +++ b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
433 @@ -1,1 +1,4 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
434 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
435 +2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
436 +b1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
437 +w |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
442 A b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
443 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
444 R a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
445 R x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
448 diff --git a/a b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
449 rename from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
450 rename to b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
451 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
452 +++ b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
453 @@ -1,3 +1,4 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
454 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
455 -m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
456 -m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
457 +2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
458 +b1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
459 +w |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
461 deleted file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
462 --- a/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
463 +++ /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
464 @@ -1,1 +0,0 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
465 -y1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
470 A b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
471 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
472 R a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
475 diff --git a/a b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
476 rename from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
477 rename to b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
478 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
479 +++ b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
480 @@ -1,1 +1,3 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
481 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
482 +2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
483 +b1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
488 A a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
489 b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
490 R b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
493 diff --git a/b b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
494 rename from b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
495 rename to a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
496 --- a/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
497 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
498 @@ -1,3 +1,1 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
499 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
500 -2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
501 -b1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
506 A b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
507 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
508 R a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
509 R x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
512 diff --git a/a b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
513 rename from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
514 rename to b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
515 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
516 +++ b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
517 @@ -1,3 +1,3 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
518 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
519 -m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
520 -m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
521 +2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
522 +b1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
524 deleted file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
525 --- a/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
526 +++ /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
527 @@ -1,1 +0,0 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
528 -y1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
533 A a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
534 b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
535 A x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
536 R b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
539 diff --git a/b b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
540 rename from b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
541 rename to a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
542 --- a/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
543 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
544 @@ -1,3 +1,3 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
545 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
546 -2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
547 -b1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
548 +m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
549 +m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
551 new file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
552 --- /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
553 +++ b/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
554 @@ -0,0 +1,1 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
555 +y1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
556 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
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:
10179
diff
changeset
|
573 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
576 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
577 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
578 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
579 @@ -1,2 +1,3 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
580 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
581 3 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
582 +w |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
587 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
588 A b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
589 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
592 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
593 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
594 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
595 @@ -1,1 +1,3 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
596 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
597 +3 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
598 +w |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
599 diff --git a/a b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
600 copy from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
601 copy to b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
602 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
603 +++ b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
604 @@ -1,1 +1,3 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
605 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
606 +3 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
607 +b1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
612 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
613 A b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
614 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
615 R x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
618 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
619 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
620 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
621 @@ -1,3 +1,3 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
622 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
623 -m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
624 -m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
625 +3 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
626 +w |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
627 diff --git a/a b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
628 copy from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
629 copy to b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
630 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
631 +++ b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
632 @@ -1,3 +1,3 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
633 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
634 -m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
635 -m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
636 +3 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
637 +b1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
639 deleted file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
640 --- a/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
641 +++ /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
642 @@ -1,1 +0,0 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
643 -y1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
648 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
649 A b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
650 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
653 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
654 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
655 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
656 @@ -1,1 +1,2 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
657 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
658 +3 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
659 diff --git a/a b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
660 copy from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
661 copy to b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
662 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
663 +++ b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
664 @@ -1,1 +1,3 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
665 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
666 +3 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
667 +b1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
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:
10179
diff
changeset
|
672 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
673 R b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
674 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
675 % hg diff --git --rev . --rev 0 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
676 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
677 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
678 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
679 @@ -1,2 +1,1 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
680 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
681 -3 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
682 diff --git a/b b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
683 deleted file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
684 --- a/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
685 +++ /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
686 @@ -1,3 +0,0 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
687 -a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
688 -3 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
689 -b1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
690 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
691 # branch to parent: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
692 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
693 % hg st -C --rev 2 --rev . |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
694 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
695 A b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
696 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
697 R x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
698 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
699 % hg diff --git --rev 2 --rev . |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
700 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
701 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
702 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
703 @@ -1,3 +1,2 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
704 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
705 -m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
706 -m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
707 +3 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
708 diff --git a/a b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
709 copy from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
710 copy to b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
711 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
712 +++ b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
713 @@ -1,3 +1,3 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
714 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
715 -m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
716 -m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
717 +3 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
718 +b1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
719 diff --git a/x/y b/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
720 deleted file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
721 --- a/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
722 +++ /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
723 @@ -1,1 +0,0 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
724 -y1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
725 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
726 # parent to branch: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
727 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
728 % hg st -C --rev . --rev 2 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
729 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
730 A x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
731 R b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
732 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
733 % hg diff --git --rev . --rev 2 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
734 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
735 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
736 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
737 @@ -1,2 +1,3 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
738 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
739 -3 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
740 +m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
741 +m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
742 diff --git a/b b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
743 deleted file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
744 --- a/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
745 +++ /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
746 @@ -1,3 +0,0 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
747 -a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
748 -3 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
749 -b1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
750 diff --git a/x/y b/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
751 new file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
752 --- /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
753 +++ b/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
754 @@ -0,0 +1,1 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
755 +y1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
756 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
757 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
758 rename chain |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
759 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
760 $ 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
|
761 % add a 4 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
762 % hg ci -m t0 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
763 created new head |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
764 % hg mv a b |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
765 % hg ci -m t1 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
766 % hg mv b c |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
767 % hg ci -m t2 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
768 % hg mv c d |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
769 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
770 # working to parent: |
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 % hg st -C |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
773 A d |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
774 c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
775 R c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
776 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
777 % hg diff --git |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
778 diff --git a/c b/d |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
779 rename from c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
780 rename to d |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
781 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
782 # working to root: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
783 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
784 % hg st -C --rev 0 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
785 A d |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
786 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
787 R a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
788 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
789 % hg diff --git --rev 0 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
790 diff --git a/a b/d |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
791 rename from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
792 rename to d |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
793 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
794 +++ b/d |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
795 @@ -1,1 +1,2 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
796 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
797 +4 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
798 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
799 # working to branch: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
800 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
801 % hg st -C --rev 2 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
802 A d |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
803 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
804 R a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
805 R x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
806 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
807 % hg diff --git --rev 2 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
808 diff --git a/a b/d |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
809 rename from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
810 rename to d |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
811 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
812 +++ b/d |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
813 @@ -1,3 +1,2 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
814 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
815 -m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
816 -m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
817 +4 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
818 diff --git a/x/y b/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
819 deleted file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
820 --- a/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
821 +++ /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
822 @@ -1,1 +0,0 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
823 -y1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
824 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
825 # root to parent: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
826 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
827 % hg st -C --rev 0 --rev . |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
828 A c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
829 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
830 R a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
831 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
832 % hg diff --git --rev 0 --rev . |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
833 diff --git a/a b/c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
834 rename from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
835 rename to c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
836 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
837 +++ b/c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
838 @@ -1,1 +1,2 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
839 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
840 +4 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
841 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
842 # parent to root: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
843 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
844 % hg st -C --rev . --rev 0 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
845 A a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
846 c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
847 R c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
848 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
849 % hg diff --git --rev . --rev 0 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
850 diff --git a/c b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
851 rename from c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
852 rename to a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
853 --- a/c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
854 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
855 @@ -1,2 +1,1 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
856 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
857 -4 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
858 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
859 # branch to parent: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
860 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
861 % hg st -C --rev 2 --rev . |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
862 A c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
863 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
864 R a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
865 R x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
866 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
867 % hg diff --git --rev 2 --rev . |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
868 diff --git a/a b/c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
869 rename from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
870 rename to c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
871 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
872 +++ b/c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
873 @@ -1,3 +1,2 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
874 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
875 -m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
876 -m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
877 +4 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
878 diff --git a/x/y b/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
879 deleted file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
880 --- a/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
881 +++ /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
882 @@ -1,1 +0,0 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
883 -y1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
884 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
885 # parent to branch: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
886 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
887 % hg st -C --rev . --rev 2 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
888 A a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
889 c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
890 A x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
891 R c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
892 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
893 % hg diff --git --rev . --rev 2 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
894 diff --git a/c b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
895 rename from c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
896 rename to a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
897 --- a/c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
898 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
899 @@ -1,2 +1,3 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
900 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
901 -4 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
902 +m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
903 +m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
904 diff --git a/x/y b/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
905 new file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
906 --- /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
907 +++ b/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
908 @@ -0,0 +1,1 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
909 +y1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
910 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
911 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
912 copy chain |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
913 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
914 $ 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
|
915 % add a 5 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
916 % hg ci -m t0 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
917 created new head |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
918 % hg cp a b |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
919 % hg ci -m t1 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
920 % hg cp b c |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
921 % hg ci -m t2 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
922 % hg cp c d |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
923 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
924 # working to parent: |
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 % hg st -C |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
927 A d |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
928 c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
929 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
930 % hg diff --git |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
931 diff --git a/c b/d |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
932 copy from c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
933 copy to d |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
934 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
935 # working to root: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
936 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
937 % hg st -C --rev 0 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
938 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
939 A b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
940 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
941 A c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
942 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
943 A d |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
944 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
945 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
946 % hg diff --git --rev 0 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
947 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
948 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
949 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
950 @@ -1,1 +1,2 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
951 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
952 +5 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
953 diff --git a/a b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
954 copy from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
955 copy to b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
956 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
957 +++ b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
958 @@ -1,1 +1,2 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
959 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
960 +5 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
961 diff --git a/a b/c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
962 copy from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
963 copy to c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
964 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
965 +++ b/c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
966 @@ -1,1 +1,2 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
967 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
968 +5 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
969 diff --git a/a b/d |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
970 copy from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
971 copy to d |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
972 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
973 +++ b/d |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
974 @@ -1,1 +1,2 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
975 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
976 +5 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
977 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
978 # working to branch: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
979 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
980 % hg st -C --rev 2 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
981 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
982 A b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
983 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
984 A c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
985 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
986 A d |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
987 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
988 R x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
989 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
990 % hg diff --git --rev 2 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
991 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
992 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
993 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
994 @@ -1,3 +1,2 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
995 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
996 -m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
997 -m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
998 +5 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
999 diff --git a/a b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1000 copy from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1001 copy to b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1002 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1003 +++ b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1004 @@ -1,3 +1,2 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1005 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1006 -m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1007 -m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1008 +5 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1009 diff --git a/a b/c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1010 copy from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1011 copy to c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1012 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1013 +++ b/c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1014 @@ -1,3 +1,2 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1015 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1016 -m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1017 -m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1018 +5 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1019 diff --git a/a b/d |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1020 copy from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1021 copy to d |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1022 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1023 +++ b/d |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1024 @@ -1,3 +1,2 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1025 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1026 -m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1027 -m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1028 +5 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1029 diff --git a/x/y b/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1030 deleted file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1031 --- a/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1032 +++ /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1033 @@ -1,1 +0,0 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1034 -y1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1035 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1036 # root to parent: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1037 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1038 % hg st -C --rev 0 --rev . |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1039 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1040 A b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1041 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1042 A c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1043 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1044 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1045 % hg diff --git --rev 0 --rev . |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1046 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1047 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1048 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1049 @@ -1,1 +1,2 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1050 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1051 +5 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1052 diff --git a/a b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1053 copy from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1054 copy to b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1055 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1056 +++ b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1057 @@ -1,1 +1,2 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1058 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1059 +5 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1060 diff --git a/a b/c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1061 copy from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1062 copy to c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1063 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1064 +++ b/c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1065 @@ -1,1 +1,2 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1066 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1067 +5 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1068 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1069 # parent to root: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1070 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1071 % hg st -C --rev . --rev 0 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1072 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1073 R b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1074 R c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1075 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1076 % hg diff --git --rev . --rev 0 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1077 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1078 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1079 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1080 @@ -1,2 +1,1 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1081 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1082 -5 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1083 diff --git a/b b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1084 deleted file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1085 --- a/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1086 +++ /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1087 @@ -1,2 +0,0 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1088 -a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1089 -5 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1090 diff --git a/c b/c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1091 deleted file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1092 --- a/c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1093 +++ /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1094 @@ -1,2 +0,0 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1095 -a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1096 -5 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1097 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1098 # branch to parent: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1099 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1100 % hg st -C --rev 2 --rev . |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1101 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1102 A b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1103 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1104 A c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1105 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1106 R x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1107 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1108 % hg diff --git --rev 2 --rev . |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1109 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1110 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1111 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1112 @@ -1,3 +1,2 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1113 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1114 -m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1115 -m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1116 +5 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1117 diff --git a/a b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1118 copy from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1119 copy to b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1120 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1121 +++ b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1122 @@ -1,3 +1,2 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1123 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1124 -m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1125 -m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1126 +5 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1127 diff --git a/a b/c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1128 copy from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1129 copy to c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1130 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1131 +++ b/c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1132 @@ -1,3 +1,2 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1133 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1134 -m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1135 -m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1136 +5 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1137 diff --git a/x/y b/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1138 deleted file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1139 --- a/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1140 +++ /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1141 @@ -1,1 +0,0 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1142 -y1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1143 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1144 # parent to branch: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1145 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1146 % hg st -C --rev . --rev 2 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1147 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1148 A x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1149 R b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1150 R c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1151 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1152 % hg diff --git --rev . --rev 2 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1153 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1154 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1155 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1156 @@ -1,2 +1,3 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1157 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1158 -5 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1159 +m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1160 +m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1161 diff --git a/b b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1162 deleted file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1163 --- a/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1164 +++ /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1165 @@ -1,2 +0,0 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1166 -a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1167 -5 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1168 diff --git a/c b/c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1169 deleted file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1170 --- a/c |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1171 +++ /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1172 @@ -1,2 +0,0 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1173 -a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1174 -5 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1175 diff --git a/x/y b/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1176 new file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1177 --- /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1178 +++ b/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1179 @@ -0,0 +1,1 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1180 +y1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1181 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1182 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1183 circular rename |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1184 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1185 $ 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
|
1186 % add a 6 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1187 % hg ci -m t0 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1188 created new head |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1189 % add a a1 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1190 % hg ci -m t1 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1191 % hg mv a b |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1192 % hg ci -m t2 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1193 % hg mv b a |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1194 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1195 # working to parent: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1196 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1197 % hg st -C |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1198 A a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1199 b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1200 R b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1201 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1202 % hg diff --git |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1203 diff --git a/b b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1204 rename from b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1205 rename to a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1206 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1207 # working to root: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1208 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1209 % hg st -C --rev 0 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1210 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1211 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1212 % hg diff --git --rev 0 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1213 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1214 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1215 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1216 @@ -1,1 +1,3 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1217 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1218 +6 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1219 +a1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1220 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1221 # working to branch: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1222 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1223 % hg st -C --rev 2 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1224 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1225 R x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1226 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1227 % hg diff --git --rev 2 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1228 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1229 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1230 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1231 @@ -1,3 +1,3 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1232 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1233 -m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1234 -m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1235 +6 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1236 +a1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1237 diff --git a/x/y b/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1238 deleted file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1239 --- a/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1240 +++ /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1241 @@ -1,1 +0,0 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1242 -y1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1243 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1244 # root to parent: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1245 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1246 % hg st -C --rev 0 --rev . |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1247 A b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1248 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1249 R a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1250 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1251 % hg diff --git --rev 0 --rev . |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1252 diff --git a/a b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1253 rename from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1254 rename to b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1255 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1256 +++ b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1257 @@ -1,1 +1,3 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1258 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1259 +6 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1260 +a1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1261 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1262 # parent to root: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1263 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1264 % hg st -C --rev . --rev 0 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1265 A a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1266 b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1267 R b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1268 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1269 % hg diff --git --rev . --rev 0 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1270 diff --git a/b b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1271 rename from b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1272 rename to a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1273 --- a/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1274 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1275 @@ -1,3 +1,1 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1276 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1277 -6 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1278 -a1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1279 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1280 # branch to parent: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1281 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1282 % hg st -C --rev 2 --rev . |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1283 A b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1284 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1285 R a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1286 R x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1287 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1288 % hg diff --git --rev 2 --rev . |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1289 diff --git a/a b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1290 rename from a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1291 rename to b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1292 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1293 +++ b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1294 @@ -1,3 +1,3 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1295 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1296 -m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1297 -m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1298 +6 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1299 +a1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1300 diff --git a/x/y b/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1301 deleted file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1302 --- a/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1303 +++ /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1304 @@ -1,1 +0,0 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1305 -y1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1306 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1307 # parent to branch: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1308 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1309 % hg st -C --rev . --rev 2 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1310 A a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1311 b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1312 A x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1313 R b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1314 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1315 % hg diff --git --rev . --rev 2 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1316 diff --git a/b b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1317 rename from b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1318 rename to a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1319 --- a/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1320 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1321 @@ -1,3 +1,3 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1322 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1323 -6 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1324 -a1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1325 +m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1326 +m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1327 diff --git a/x/y b/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1328 new file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1329 --- /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1330 +++ b/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1331 @@ -0,0 +1,1 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1332 +y1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1333 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1334 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1335 directory move |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1336 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1337 $ 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
|
1338 % add a 7 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1339 % hg ci -m t0 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1340 created new head |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1341 % hg mv x y |
18108
bc694d78d843
tests: fix some slash-based Windows failures
Kevin Bullock <kbullock@ringworld.org>
parents:
18074
diff
changeset
|
1342 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
|
1343 % hg ci -m t1 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1344 % add y/x x1 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1345 % hg ci -m t2 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1346 % add y/x x2 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1347 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1348 # working to parent: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1349 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1350 % hg st -C |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1351 M y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1352 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1353 % hg diff --git |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1354 diff --git a/y/x b/y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1355 --- a/y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1356 +++ b/y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1357 @@ -1,2 +1,3 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1358 x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1359 x1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1360 +x2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1361 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1362 # working to root: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1363 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1364 % hg st -C --rev 0 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1365 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1366 A y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1367 x/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1368 R x/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1369 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1370 % hg diff --git --rev 0 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1371 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1372 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1373 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1374 @@ -1,1 +1,2 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1375 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1376 +7 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1377 diff --git a/x/x b/y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1378 rename from x/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1379 rename to y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1380 --- a/x/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1381 +++ b/y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1382 @@ -1,1 +1,3 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1383 x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1384 +x1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1385 +x2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1386 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1387 # working to branch: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1388 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1389 % hg st -C --rev 2 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1390 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1391 A y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1392 x/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1393 R x/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1394 R x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1395 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1396 % hg diff --git --rev 2 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1397 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1398 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1399 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1400 @@ -1,3 +1,2 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1401 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1402 -m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1403 -m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1404 +7 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1405 diff --git a/x/y b/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1406 deleted file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1407 --- a/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1408 +++ /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1409 @@ -1,1 +0,0 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1410 -y1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1411 diff --git a/x/x b/y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1412 rename from x/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1413 rename to y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1414 --- a/x/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1415 +++ b/y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1416 @@ -1,1 +1,3 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1417 x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1418 +x1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1419 +x2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1420 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1421 # root to parent: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1422 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1423 % hg st -C --rev 0 --rev . |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1424 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1425 A y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1426 x/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1427 R x/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1428 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1429 % hg diff --git --rev 0 --rev . |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1430 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1431 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1432 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1433 @@ -1,1 +1,2 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1434 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1435 +7 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1436 diff --git a/x/x b/y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1437 rename from x/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1438 rename to y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1439 --- a/x/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1440 +++ b/y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1441 @@ -1,1 +1,2 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1442 x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1443 +x1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1444 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1445 # parent to root: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1446 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1447 % hg st -C --rev . --rev 0 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1448 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1449 A x/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1450 y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1451 R y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1452 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1453 % hg diff --git --rev . --rev 0 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1454 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1455 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1456 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1457 @@ -1,2 +1,1 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1458 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1459 -7 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1460 diff --git a/y/x b/x/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1461 rename from y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1462 rename to x/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1463 --- a/y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1464 +++ b/x/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1465 @@ -1,2 +1,1 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1466 x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1467 -x1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1468 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1469 # branch to parent: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1470 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1471 % hg st -C --rev 2 --rev . |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1472 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1473 A y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1474 x/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1475 R x/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1476 R x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1477 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1478 % hg diff --git --rev 2 --rev . |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1479 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1480 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1481 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1482 @@ -1,3 +1,2 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1483 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1484 -m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1485 -m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1486 +7 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1487 diff --git a/x/y b/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1488 deleted file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1489 --- a/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1490 +++ /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1491 @@ -1,1 +0,0 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1492 -y1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1493 diff --git a/x/x b/y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1494 rename from x/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1495 rename to y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1496 --- a/x/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1497 +++ b/y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1498 @@ -1,1 +1,2 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1499 x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1500 +x1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1501 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1502 # parent to branch: |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1503 |
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1504 % hg st -C --rev . --rev 2 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1505 M a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1506 A x/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1507 y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1508 A x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1509 R y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1510 |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1511 % hg diff --git --rev . --rev 2 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1512 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1513 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1514 +++ b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1515 @@ -1,2 +1,3 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1516 a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1517 -7 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1518 +m1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1519 +m2 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1520 diff --git a/y/x b/x/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1521 rename from y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1522 rename to x/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1523 --- a/y/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1524 +++ b/x/x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1525 @@ -1,2 +1,1 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1526 x |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1527 -x1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1528 diff --git a/x/y b/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1529 new file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1530 --- /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1531 +++ b/x/y |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1532 @@ -0,0 +1,1 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1533 +y1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1534 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1535 |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6286
diff
changeset
|
1536 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1537 Cannot implement unrelated branch with tb |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1538 testing copies with unrelated branch |
6425
2d9328a2f81f
copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents:
6286
diff
changeset
|
1539 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1540 $ hg init unrelated |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1541 $ cd unrelated |
18074
8c9a52492d42
tests: improve test-mv-cp-st-diff.t readability
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
1542 $ echo a >> a |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1543 $ hg ci -Am adda |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1544 adding a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1545 $ hg mv a b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1546 $ hg ci -m movea |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1547 $ hg up -C null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1548 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
|
1549 $ echo a >> a |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1550 $ hg ci -Am addunrelateda |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1551 adding a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1552 created new head |
10179
83cfa1baf8ad
copies: don't report copies with unrelated branch
Patrick Mezard <pmezard@gmail.com>
parents:
8518
diff
changeset
|
1553 |
12469
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1554 unrelated branch diff |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1555 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1556 $ hg diff --git -r 2 -r 1 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1557 diff --git a/a b/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1558 deleted file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1559 --- a/a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1560 +++ /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1561 @@ -1,1 +0,0 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1562 -a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1563 diff --git a/b b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1564 new file mode 100644 |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1565 --- /dev/null |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1566 +++ b/b |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1567 @@ -0,0 +1,1 @@ |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1568 +a |
be6d33671c95
tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents:
10179
diff
changeset
|
1569 $ cd .. |
20294
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1570 |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1571 |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1572 test for case where we didn't look sufficiently far back to find rename ancestor |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1573 |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1574 $ hg init diffstop |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1575 $ cd diffstop |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1576 $ echo > f |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1577 $ hg ci -qAmf |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1578 $ hg mv f g |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1579 $ hg ci -m'f->g' |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1580 $ hg up -qr0 |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1581 $ touch x |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1582 $ hg ci -qAmx |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1583 $ echo f > f |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1584 $ hg ci -qmf=f |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1585 $ hg merge -q |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1586 $ hg ci -mmerge |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1587 $ hg log -G --template '{rev} {desc}' |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1588 @ 4 merge |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1589 |\ |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1590 | o 3 f=f |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1591 | | |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1592 | o 2 x |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1593 | | |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1594 o | 1 f->g |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1595 |/ |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1596 o 0 f |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1597 |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1598 $ hg diff --git -r 2 |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1599 diff --git a/f b/g |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1600 rename from f |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1601 rename to g |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1602 --- a/f |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1603 +++ b/g |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1604 @@ -1,1 +1,1 @@ |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1605 - |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1606 +f |
243ea5ffdf31
diff: search beyond ancestor when detecting renames
Mads Kiilerich <madski@unity3d.com>
parents:
18136
diff
changeset
|
1607 $ cd .. |
23702
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1608 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1609 Additional tricky linkrev case |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1610 ------------------------------ |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1611 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1612 If the first file revision after the diff base has a linkrev pointing to a |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1613 changeset on another branch with a revision lower that the diff base, we can |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1614 jump past the copy detection limit and fail to detect the rename. |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1615 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1616 $ hg init diffstoplinkrev |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1617 $ cd diffstoplinkrev |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1618 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1619 $ touch f |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1620 $ hg ci -Aqm 'empty f' |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1621 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1622 Make a simple change |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1623 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1624 $ echo change > f |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1625 $ hg ci -m 'change f' |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1626 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1627 Make a second branch, we use a named branch to create a simple commit |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1628 that does not touch f. |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1629 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1630 $ hg up -qr 'desc(empty)' |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1631 $ hg branch -q dev |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1632 $ hg ci -Aqm dev |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1633 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1634 Graft the initial change, as f was untouched, we reuse the same entry and the |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1635 linkrev point to the older branch. |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1636 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1637 $ hg graft -q 'desc(change)' |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1638 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1639 Make a rename because we want to track renames. It is also important that the |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1640 faulty linkrev is not the "start" commit to ensure the linkrev will be used. |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1641 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1642 $ hg mv f renamed |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1643 $ hg ci -m renamed |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1644 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1645 $ hg log -G -T '{rev} {desc}' |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1646 @ 4 renamed |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1647 | |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1648 o 3 change f |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1649 | |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1650 o 2 dev |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1651 | |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1652 | o 1 change f |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1653 |/ |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1654 o 0 empty f |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1655 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1656 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1657 The copy tracking should still reach rev 2 (branch creation). |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1658 accessing the parent of 4 (renamed) should not jump use to revision 1. |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1659 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1660 $ hg diff --git -r 'desc(dev)' -r . |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1661 diff --git a/f b/renamed |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1662 rename from f |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1663 rename to renamed |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1664 --- a/f |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1665 +++ b/renamed |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1666 @@ -0,0 +1,1 @@ |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1667 +change |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1668 |
c48924787eaa
filectx.parents: enforce changeid of parent to be in own changectx ancestors
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20294
diff
changeset
|
1669 $ cd .. |