Mercurial > hg-stable
annotate tests/test-revert.t @ 23161:6f31f46b8544
test-revert: make sure all 'tracked' files are really tracked
When a file is missing in the 'parent' version and is tracked but
missing in the working directory, which happens by the 'missing' or
'removed' types, and the 'clean' type in the working directory, the
file does not exist in the working directory (unlike it would had the
'deleted' type been used). Thus, the *_missing_missing_tracked are not
actually tracked and they end up testing the same state as
*_missing_missing_untracked. To make them tracked, add a temporary
file, just like we do for the delete case. For simplicity's sake,
let's make sure the gen-revert-cases.py script always puts a file in
the working directory, whether or not it's going to be deleted.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Sun, 19 Oct 2014 22:19:22 -0700 |
parents | 4f4e6815f286 |
children | 8c29000c4295 |
rev | line source |
---|---|
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
1 $ hg init repo |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
2 $ cd repo |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
3 $ echo 123 > a |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
4 $ echo 123 > c |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
5 $ echo 123 > e |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
6 $ hg add a c e |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12106
diff
changeset
|
7 $ hg commit -m "first" a c e |
14745
cae09a39b2d2
test-revert: add case for nothing changed
Adrian Buehlmann <adrian@cadifra.com>
parents:
14726
diff
changeset
|
8 |
cae09a39b2d2
test-revert: add case for nothing changed
Adrian Buehlmann <adrian@cadifra.com>
parents:
14726
diff
changeset
|
9 nothing changed |
cae09a39b2d2
test-revert: add case for nothing changed
Adrian Buehlmann <adrian@cadifra.com>
parents:
14726
diff
changeset
|
10 |
cae09a39b2d2
test-revert: add case for nothing changed
Adrian Buehlmann <adrian@cadifra.com>
parents:
14726
diff
changeset
|
11 $ hg revert |
cae09a39b2d2
test-revert: add case for nothing changed
Adrian Buehlmann <adrian@cadifra.com>
parents:
14726
diff
changeset
|
12 abort: no files or directories specified |
14755
6ba51c81ff75
revert: improve hints on abort when reverting to parent without --all
Adrian Buehlmann <adrian@cadifra.com>
parents:
14745
diff
changeset
|
13 (use --all to revert all files) |
14745
cae09a39b2d2
test-revert: add case for nothing changed
Adrian Buehlmann <adrian@cadifra.com>
parents:
14726
diff
changeset
|
14 [255] |
14767
aab323df2c44
test-revert: add revert --all case when nothing changed
Adrian Buehlmann <adrian@cadifra.com>
parents:
14755
diff
changeset
|
15 $ hg revert --all |
14745
cae09a39b2d2
test-revert: add case for nothing changed
Adrian Buehlmann <adrian@cadifra.com>
parents:
14726
diff
changeset
|
16 |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
17 Introduce some changes and revert them |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
18 -------------------------------------- |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
19 |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
20 $ echo 123 > b |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
21 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
22 $ hg status |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
23 ? b |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
24 $ echo 12 > c |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
25 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
26 $ hg status |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
27 M c |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
28 ? b |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
29 $ hg add b |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
30 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
31 $ hg status |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
32 M c |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
33 A b |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
34 $ hg rm a |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
35 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
36 $ hg status |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
37 M c |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
38 A b |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
39 R a |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
40 |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
41 revert removal of a file |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
42 |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
43 $ hg revert a |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
44 $ hg status |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
45 M c |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
46 A b |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
47 |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
48 revert addition of a file |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
49 |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
50 $ hg revert b |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
51 $ hg status |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
52 M c |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
53 ? b |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
54 |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
55 revert modification of a file (--no-backup) |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
56 |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
57 $ hg revert --no-backup c |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
58 $ hg status |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
59 ? b |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
60 |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
61 revert deletion (! status) of a added file |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
62 ------------------------------------------ |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
63 |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
64 $ hg add b |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
65 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
66 $ hg status b |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
67 A b |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
68 $ rm b |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
69 $ hg status b |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
70 ! b |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
71 $ hg revert -v b |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
72 forgetting b |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
73 $ hg status b |
15521
117f9190c1ba
tests: hide 'No such file or directory' messages
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
74 b: * (glob) |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
75 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
76 $ ls |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
77 a |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
78 c |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
79 e |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
80 |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
81 Test creation of backup (.orig) files |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
82 ------------------------------------- |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
83 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
84 $ echo z > e |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
85 $ hg revert --all -v |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
86 saving current version of e as e.orig |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
87 reverting e |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
88 |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
89 revert on clean file (no change) |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
90 -------------------------------- |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
91 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
92 $ hg revert a |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
93 no changes needed to a |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
94 |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
95 revert on an untracked file |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
96 --------------------------- |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
97 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
98 $ echo q > q |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
99 $ hg revert q |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
100 file not managed: q |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
101 $ rm q |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
102 |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
103 revert on file that does not exists |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
104 ----------------------------------- |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
105 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
106 $ hg revert notfound |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12106
diff
changeset
|
107 notfound: no such file in rev 334a9e57682c |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
108 $ touch d |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
109 $ hg add d |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
110 $ hg rm a |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12106
diff
changeset
|
111 $ hg commit -m "second" |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
112 $ echo z > z |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
113 $ hg add z |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
114 $ hg st |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
115 A z |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
116 ? e.orig |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
117 |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
118 revert to another revision (--rev) |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
119 ---------------------------------- |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
120 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
121 $ hg revert --all -r0 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
122 adding a |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
123 removing d |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
124 forgetting z |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
125 |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
126 revert explicitly to parent (--rev) |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
127 ----------------------------------- |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
128 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
129 $ hg revert --all -rtip |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
130 forgetting a |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
131 undeleting d |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
132 $ rm a *.orig |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
133 |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
134 revert to another revision (--rev) and exact match |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
135 -------------------------------------------------- |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
136 |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
137 exact match are more silent |
1447
508a3f559553
revert added and removed files to their normal state before reverting
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
138 |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
139 $ hg revert -r0 a |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
140 $ hg st a |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
141 A a |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
142 $ hg rm d |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
143 $ hg st d |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
144 R d |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
145 |
22156
03a45eff9d2b
revert: issue "no changes needed" message for files missing on both side
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22144
diff
changeset
|
146 should keep d removed |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
147 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
148 $ hg revert -r0 d |
22156
03a45eff9d2b
revert: issue "no changes needed" message for files missing on both side
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22144
diff
changeset
|
149 no changes needed to d |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
150 $ hg st d |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
151 R d |
2157
1e82f2337498
make test-revert check executable bit.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2043
diff
changeset
|
152 |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
153 $ hg update -C |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
154 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
155 |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
156 revert of exec bit |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
157 ------------------ |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
158 |
16886
8c1cf3e3fe42
test-revert: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
15521
diff
changeset
|
159 #if execbit |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
160 $ chmod +x c |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
161 $ hg revert --all |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
162 reverting c |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
163 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
164 $ test -x c || echo non-executable |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
165 non-executable |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
166 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
167 $ chmod +x c |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12106
diff
changeset
|
168 $ hg commit -m exe |
2157
1e82f2337498
make test-revert check executable bit.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2043
diff
changeset
|
169 |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
170 $ chmod -x c |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
171 $ hg revert --all |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
172 reverting c |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
173 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
174 $ test -x c && echo executable |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
175 executable |
16886
8c1cf3e3fe42
test-revert: enable for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
15521
diff
changeset
|
176 #endif |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
177 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
178 $ cd .. |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
179 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
180 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12316
diff
changeset
|
181 Issue241: update and revert produces inconsistent repositories |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
182 -------------------------------------------------------------- |
2982
890e285c52a1
revert: require --all to revert all files.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2272
diff
changeset
|
183 |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
184 $ hg init a |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
185 $ cd a |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
186 $ echo a >> a |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
187 $ hg commit -A -d '1 0' -m a |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
188 adding a |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
189 $ echo a >> a |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
190 $ hg commit -d '2 0' -m a |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
191 $ hg update 0 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
192 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
193 $ mkdir b |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
194 $ echo b > b/b |
2272
e9a0ed9ed4d9
revert: fix corner case found by faheem mitha.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2157
diff
changeset
|
195 |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
196 call `hg revert` with no file specified |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
197 --------------------------------------- |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
198 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
199 $ hg revert -rtip |
14542
afe0d4c24866
revert: drop requirement to use -r to revert with two parents
Matt Mackall <mpm@selenic.com>
parents:
12399
diff
changeset
|
200 abort: no files or directories specified |
14726
e0039716f3ea
revert: mention update in hint of abort when reverting to non-parent
Adrian Buehlmann <adrian@cadifra.com>
parents:
14713
diff
changeset
|
201 (use --all to revert all files, or 'hg update 1' to update) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
202 [255] |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
203 |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
204 call `hg revert` with --all |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
205 --------------------------- |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
206 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
207 $ hg revert --all -rtip |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
208 reverting a |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
209 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
210 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12316
diff
changeset
|
211 Issue332: confusing message when reverting directory |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
212 ---------------------------------------------------- |
2982
890e285c52a1
revert: require --all to revert all files.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2272
diff
changeset
|
213 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12106
diff
changeset
|
214 $ hg ci -A -m b |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
215 adding b/b |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
216 created new head |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
217 $ echo foobar > b/b |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
218 $ mkdir newdir |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
219 $ echo foo > newdir/newfile |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
220 $ hg add newdir/newfile |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
221 $ hg revert b newdir |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15442
diff
changeset
|
222 reverting b/b (glob) |
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15442
diff
changeset
|
223 forgetting newdir/newfile (glob) |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
224 $ echo foobar > b/b |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
225 $ hg revert . |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15442
diff
changeset
|
226 reverting b/b (glob) |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
227 |
5230
bfd73b567b3d
When reverting a file which was renamed, also revert the old name
Brendan Cully <brendan@kublai.com>
parents:
4237
diff
changeset
|
228 |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
229 reverting a rename target should revert the source |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
230 -------------------------------------------------- |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
231 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
232 $ hg mv a newa |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
233 $ hg revert newa |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
234 $ hg st a newa |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
235 ? newa |
5230
bfd73b567b3d
When reverting a file which was renamed, also revert the old name
Brendan Cully <brendan@kublai.com>
parents:
4237
diff
changeset
|
236 |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
237 $ cd .. |
6031
7383384793fb
revert: don't assume ignored files will be returned in the unknown list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5230
diff
changeset
|
238 |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
239 $ hg init ignored |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
240 $ cd ignored |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
241 $ echo '^ignored$' > .hgignore |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
242 $ echo '^ignoreddir$' >> .hgignore |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
243 $ echo '^removed$' >> .hgignore |
6031
7383384793fb
revert: don't assume ignored files will be returned in the unknown list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5230
diff
changeset
|
244 |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
245 $ mkdir ignoreddir |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
246 $ touch ignoreddir/file |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
247 $ touch ignoreddir/removed |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
248 $ touch ignored |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
249 $ touch removed |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
250 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
251 4 ignored files (we will add/commit everything) |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
252 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
253 $ hg st -A -X .hgignore |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
254 I ignored |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
255 I ignoreddir/file |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
256 I ignoreddir/removed |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
257 I removed |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
258 $ hg ci -qAm 'add files' ignored ignoreddir/file ignoreddir/removed removed |
6031
7383384793fb
revert: don't assume ignored files will be returned in the unknown list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5230
diff
changeset
|
259 |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
260 $ echo >> ignored |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
261 $ echo >> ignoreddir/file |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
262 $ hg rm removed ignoreddir/removed |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
263 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
264 should revert ignored* and undelete *removed |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
265 -------------------------------------------- |
6031
7383384793fb
revert: don't assume ignored files will be returned in the unknown list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5230
diff
changeset
|
266 |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
267 $ hg revert -a --no-backup |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
268 reverting ignored |
15447
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15442
diff
changeset
|
269 reverting ignoreddir/file (glob) |
9910f60a37ee
tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents:
15442
diff
changeset
|
270 undeleting ignoreddir/removed (glob) |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
271 undeleting removed |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
272 $ hg st -mardi |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
273 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
274 $ hg up -qC |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
275 $ echo >> ignored |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
276 $ hg rm removed |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
277 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
278 should silently revert the named files |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
279 -------------------------------------- |
12106
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
280 |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
281 $ hg revert --no-backup ignored removed |
969176bec217
tests: unify test-revert
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
6110
diff
changeset
|
282 $ hg st -mardi |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16886
diff
changeset
|
283 |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
284 Reverting copy (issue3920) |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
285 -------------------------- |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
286 |
19129
bd19587a3347
revert: ensure that copies and renames are honored (issue3920)
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
287 someone set up us the copies |
bd19587a3347
revert: ensure that copies and renames are honored (issue3920)
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
288 |
bd19587a3347
revert: ensure that copies and renames are honored (issue3920)
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
289 $ rm .hgignore |
bd19587a3347
revert: ensure that copies and renames are honored (issue3920)
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
290 $ hg update -C |
bd19587a3347
revert: ensure that copies and renames are honored (issue3920)
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
291 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
bd19587a3347
revert: ensure that copies and renames are honored (issue3920)
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
292 $ hg mv ignored allyour |
bd19587a3347
revert: ensure that copies and renames are honored (issue3920)
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
293 $ hg copy removed base |
bd19587a3347
revert: ensure that copies and renames are honored (issue3920)
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
294 $ hg commit -m rename |
bd19587a3347
revert: ensure that copies and renames are honored (issue3920)
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
295 |
bd19587a3347
revert: ensure that copies and renames are honored (issue3920)
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
296 copies and renames, you have no chance to survive make your time (issue3920) |
bd19587a3347
revert: ensure that copies and renames are honored (issue3920)
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
297 |
bd19587a3347
revert: ensure that copies and renames are honored (issue3920)
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
298 $ hg update '.^' |
bd19587a3347
revert: ensure that copies and renames are honored (issue3920)
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
299 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
bd19587a3347
revert: ensure that copies and renames are honored (issue3920)
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
300 $ hg revert -rtip -a |
bd19587a3347
revert: ensure that copies and renames are honored (issue3920)
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
301 adding allyour |
bd19587a3347
revert: ensure that copies and renames are honored (issue3920)
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
302 adding base |
bd19587a3347
revert: ensure that copies and renames are honored (issue3920)
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
303 removing ignored |
bd19587a3347
revert: ensure that copies and renames are honored (issue3920)
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
304 $ hg status -C |
bd19587a3347
revert: ensure that copies and renames are honored (issue3920)
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
305 A allyour |
bd19587a3347
revert: ensure that copies and renames are honored (issue3920)
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
306 ignored |
bd19587a3347
revert: ensure that copies and renames are honored (issue3920)
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
307 A base |
bd19587a3347
revert: ensure that copies and renames are honored (issue3920)
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
308 removed |
bd19587a3347
revert: ensure that copies and renames are honored (issue3920)
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
309 R ignored |
bd19587a3347
revert: ensure that copies and renames are honored (issue3920)
Bryan O'Sullivan <bryano@fb.com>
parents:
16913
diff
changeset
|
310 |
21573
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
311 Test revert of a file added by one side of the merge |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
312 ==================================================== |
21573
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
313 |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
314 remove any pending change |
21573
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
315 |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
316 $ hg revert --all |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
317 forgetting allyour |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
318 forgetting base |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
319 undeleting ignored |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
320 $ hg purge --all --config extensions.purge= |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
321 |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
322 Adds a new commit |
21573
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
323 |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
324 $ echo foo > newadd |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
325 $ hg add newadd |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
326 $ hg commit -m 'other adds' |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
327 created new head |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
328 |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
329 |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
330 merge it with the other head |
21573
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
331 |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
332 $ hg merge # merge 1 into 2 |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
333 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
334 (branch merge, don't forget to commit) |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
335 $ hg summary |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
336 parent: 2:b8ec310b2d4e tip |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
337 other adds |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
338 parent: 1:f6180deb8fbe |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
339 rename |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
340 branch: default |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
341 commit: 2 modified, 1 removed (merge) |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
342 update: (current) |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
343 |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
344 clarifies who added what |
21573
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
345 |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
346 $ hg status |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
347 M allyour |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
348 M base |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
349 R ignored |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
350 $ hg status --change 'p1()' |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
351 A newadd |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
352 $ hg status --change 'p2()' |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
353 A allyour |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
354 A base |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
355 R ignored |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
356 |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
357 revert file added by p1() to p1() state |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
358 ----------------------------------------- |
21573
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
359 |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
360 $ hg revert -r 'p1()' 'glob:newad?' |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
361 $ hg status |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
362 M allyour |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
363 M base |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
364 R ignored |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
365 |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
366 revert file added by p1() to p2() state |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
367 ------------------------------------------ |
21573
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
368 |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
369 $ hg revert -r 'p2()' 'glob:newad?' |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
370 removing newadd |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
371 $ hg status |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
372 M allyour |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
373 M base |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
374 R ignored |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
375 R newadd |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
376 |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
377 revert file added by p2() to p2() state |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
378 ------------------------------------------ |
21573
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
379 |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
380 $ hg revert -r 'p2()' 'glob:allyou?' |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
381 $ hg status |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
382 M allyour |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
383 M base |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
384 R ignored |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
385 R newadd |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
386 |
22099
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
387 revert file added by p2() to p1() state |
9ed5e1053303
test-revert: improve comment
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21579
diff
changeset
|
388 ------------------------------------------ |
21573
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
389 |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
390 $ hg revert -r 'p1()' 'glob:allyou?' |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
391 removing allyour |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
392 $ hg status |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
393 M base |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
394 R allyour |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
395 R ignored |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
396 R newadd |
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
397 |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
398 Systematic behavior validation of most possible cases |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
399 ===================================================== |
21573
4af19d39706e
revert: add a test case to reverting "add" during merges
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
19129
diff
changeset
|
400 |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
401 This section tests most of the possible combinations of revision states and |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
402 working directory states. The number of possible cases is significant but they |
23139
e53f6b72a0e4
spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents:
23135
diff
changeset
|
403 but they all have a slightly different handling. So this section commits to |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
404 and testing all of them to allow safe refactoring of the revert code. |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
405 |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
406 A python script is used to generate a file history for each combination of |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
407 states, on one side the content (or lack thereof) in two revisions, and |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
408 on the other side, the content and "tracked-ness" of the working directory. The |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
409 three states generated are: |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
410 |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
411 - a "base" revision |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
412 - a "parent" revision |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
413 - the working directory (based on "parent") |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
414 |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
415 The files generated have names of the form: |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
416 |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
417 <rev1-content>_<rev2-content>_<working-copy-content>-<tracked-ness> |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
418 |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
419 All known states are not tested yet. See inline documentation for details. |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
420 Special cases from merge and rename are not tested by this section. |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
421 |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
422 Write the python script to disk |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
423 ------------------------------- |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
424 |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
425 $ cat << EOF > gen-revert-cases.py |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
426 > # generate proper file state to test revert behavior |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
427 > import sys |
22133
d732ff677b96
test-revert: add case where file is added between "base" and "parent"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22131
diff
changeset
|
428 > import os |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
429 > |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
430 > # content of the file in "base" and "parent" |
22133
d732ff677b96
test-revert: add case where file is added between "base" and "parent"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22131
diff
changeset
|
431 > # None means no file at all |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
432 > ctxcontent = { |
22135
37d2bd2c04f6
test-revert: add case where file is unchanged between "base" and "parent"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22133
diff
changeset
|
433 > # clean: no change from base to parent |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
434 > 'clean': ['content1', 'content1'], |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
435 > # modified: file content change from base to parent |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
436 > 'modified': ['content1', 'content2'], |
22133
d732ff677b96
test-revert: add case where file is added between "base" and "parent"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22131
diff
changeset
|
437 > # added: file is missing from base and added in parent |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
438 > 'added': [None, 'content2'], |
22136
a29574cb8552
test-revert: add case where the file is removed between "base" and "parent"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22135
diff
changeset
|
439 > # removed: file exist in base but is removed from parent |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
440 > 'removed': ['content1', None], |
22137
2cfe5ec47803
test-revert: add case where file exists neither in "base" nor in "parent"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22136
diff
changeset
|
441 > # file exist neither in base not in parent |
2cfe5ec47803
test-revert: add case where file exists neither in "base" nor in "parent"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22136
diff
changeset
|
442 > 'missing': [None, None], |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
443 > } |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
444 > |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
445 > # content of file in working copy |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
446 > wccontent = { |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
447 > # clean: wc content is the same as parent |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
448 > 'clean': (True, lambda cc: cc[1]), |
22138
80206e63c3cc
test-revert: add case where wc content is already reverted to base content
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22137
diff
changeset
|
449 > # revert: wc content is the same as base |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
450 > 'revert': (True, lambda cc: cc[0]), |
22139
1ecd6f1f9869
test-revert: add case where wc content is different from "base" and "parent"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22138
diff
changeset
|
451 > # wc: file exist with a content different from base and parent |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
452 > 'wc': (True, lambda cc: 'content3'), |
22144
b7c9f07b76c1
test-revert: add case where file is tracked but deleted in working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22143
diff
changeset
|
453 > # deleted: file is recorded as tracked but missing |
b7c9f07b76c1
test-revert: add case where file is tracked but deleted in working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22143
diff
changeset
|
454 > # rely on file deletion outside of this script |
23161
6f31f46b8544
test-revert: make sure all 'tracked' files are really tracked
Martin von Zweigbergk <martinvonz@google.com>
parents:
23160
diff
changeset
|
455 > 'deleted': (True, lambda cc: None), |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
456 > } |
22141
6b522c1139a9
test-revert: add case where file exists but is untracked in working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22140
diff
changeset
|
457 > # untracked-X is a version of X where the file is not tracked (? unknown) |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
458 > wccontent['untracked-clean'] = (False, wccontent['clean'][1]) |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
459 > wccontent['untracked-deleted'] = (False, wccontent['deleted'][1]) |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
460 > wccontent['untracked-revert'] = (False, wccontent['revert'][1]) |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
461 > wccontent['untracked-wc'] = (False, wccontent['wc'][1]) |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
462 > |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
463 > # build the combination of possible states |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
464 > combination = [] |
23160
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
465 > for ctxkey, ctxvalue in ctxcontent.iteritems(): |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
466 > for wckey, (tracked, wcfunc) in wccontent.iteritems(): |
23157
0e80564a6f3c
test-revert: put content, not keys, into 'combination'
Martin von Zweigbergk <martinvonz@google.com>
parents:
23156
diff
changeset
|
467 > base, parent = ctxvalue |
0e80564a6f3c
test-revert: put content, not keys, into 'combination'
Martin von Zweigbergk <martinvonz@google.com>
parents:
23156
diff
changeset
|
468 > if (base == parent and 'revert' in wckey): |
23153
9ce22bdcd8bc
test-revert: reverting no change means it's clean
Martin von Zweigbergk <martinvonz@google.com>
parents:
23139
diff
changeset
|
469 > continue |
23157
0e80564a6f3c
test-revert: put content, not keys, into 'combination'
Martin von Zweigbergk <martinvonz@google.com>
parents:
23156
diff
changeset
|
470 > if not base and 'revert' in wckey: |
23154
690db7415e23
test-revert: reverting an addition is the same as removing
Martin von Zweigbergk <martinvonz@google.com>
parents:
23153
diff
changeset
|
471 > continue |
23157
0e80564a6f3c
test-revert: put content, not keys, into 'combination'
Martin von Zweigbergk <martinvonz@google.com>
parents:
23156
diff
changeset
|
472 > if not parent and 'deleted' in wckey: |
23155
25e12d496429
test-revert: removing a missing file has no effect
Martin von Zweigbergk <martinvonz@google.com>
parents:
23154
diff
changeset
|
473 > continue |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
474 > def statestring(content): |
23161
6f31f46b8544
test-revert: make sure all 'tracked' files are really tracked
Martin von Zweigbergk <martinvonz@google.com>
parents:
23160
diff
changeset
|
475 > return content is None and 'missing' or content |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
476 > wcc = wcfunc(ctxvalue) |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
477 > trackedstring = tracked and 'tracked' or 'untracked' |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
478 > filename = "%s_%s_%s-%s" % (statestring(base), |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
479 > statestring(parent), |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
480 > statestring(wcc), |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
481 > trackedstring) |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
482 > combination.append((filename, base, parent, wcc)) |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
483 > |
23160
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
484 > # make sure we have stable output |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
485 > combination.sort() |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
486 > |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
487 > # retrieve the state we must generate |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
488 > target = sys.argv[1] |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
489 > |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
490 > # compute file content |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
491 > content = [] |
23157
0e80564a6f3c
test-revert: put content, not keys, into 'combination'
Martin von Zweigbergk <martinvonz@google.com>
parents:
23156
diff
changeset
|
492 > for filename, base, parent, wcc in combination: |
22127
3163b8f8ff26
test-revert: display the list of all generated cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22126
diff
changeset
|
493 > if target == 'filelist': |
3163b8f8ff26
test-revert: display the list of all generated cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22126
diff
changeset
|
494 > print filename |
3163b8f8ff26
test-revert: display the list of all generated cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22126
diff
changeset
|
495 > elif target == 'base': |
23157
0e80564a6f3c
test-revert: put content, not keys, into 'combination'
Martin von Zweigbergk <martinvonz@google.com>
parents:
23156
diff
changeset
|
496 > content.append((filename, base)) |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
497 > elif target == 'parent': |
23157
0e80564a6f3c
test-revert: put content, not keys, into 'combination'
Martin von Zweigbergk <martinvonz@google.com>
parents:
23156
diff
changeset
|
498 > content.append((filename, parent)) |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
499 > elif target == 'wc': |
23161
6f31f46b8544
test-revert: make sure all 'tracked' files are really tracked
Martin von Zweigbergk <martinvonz@google.com>
parents:
23160
diff
changeset
|
500 > # Make sure there is content so the file gets written and can be |
6f31f46b8544
test-revert: make sure all 'tracked' files are really tracked
Martin von Zweigbergk <martinvonz@google.com>
parents:
23160
diff
changeset
|
501 > # tracked. It will be deleted outside of this script. |
6f31f46b8544
test-revert: make sure all 'tracked' files are really tracked
Martin von Zweigbergk <martinvonz@google.com>
parents:
23160
diff
changeset
|
502 > content.append((filename, wcc or 'TOBEDELETED')) |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
503 > else: |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
504 > print >> sys.stderr, "unknown target:", target |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
505 > sys.exit(1) |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
506 > |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
507 > # write actual content |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
508 > for filename, data in content: |
22133
d732ff677b96
test-revert: add case where file is added between "base" and "parent"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22131
diff
changeset
|
509 > if data is not None: |
d732ff677b96
test-revert: add case where file is added between "base" and "parent"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22131
diff
changeset
|
510 > f = open(filename, 'w') |
d732ff677b96
test-revert: add case where file is added between "base" and "parent"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22131
diff
changeset
|
511 > f.write(data + '\n') |
d732ff677b96
test-revert: add case where file is added between "base" and "parent"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22131
diff
changeset
|
512 > f.close() |
d732ff677b96
test-revert: add case where file is added between "base" and "parent"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22131
diff
changeset
|
513 > elif os.path.exists(filename): |
d732ff677b96
test-revert: add case where file is added between "base" and "parent"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22131
diff
changeset
|
514 > os.remove(filename) |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
515 > EOF |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
516 |
22127
3163b8f8ff26
test-revert: display the list of all generated cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22126
diff
changeset
|
517 check list of planned files |
3163b8f8ff26
test-revert: display the list of all generated cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22126
diff
changeset
|
518 |
3163b8f8ff26
test-revert: display the list of all generated cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22126
diff
changeset
|
519 $ python gen-revert-cases.py filelist |
23160
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
520 content1_content1_content1-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
521 content1_content1_content1-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
522 content1_content1_content3-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
523 content1_content1_content3-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
524 content1_content1_missing-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
525 content1_content1_missing-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
526 content1_content2_content1-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
527 content1_content2_content1-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
528 content1_content2_content2-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
529 content1_content2_content2-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
530 content1_content2_content3-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
531 content1_content2_content3-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
532 content1_content2_missing-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
533 content1_content2_missing-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
534 content1_missing_content1-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
535 content1_missing_content1-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
536 content1_missing_content3-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
537 content1_missing_content3-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
538 content1_missing_missing-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
539 content1_missing_missing-untracked |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
540 missing_content2_content2-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
541 missing_content2_content2-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
542 missing_content2_content3-tracked |
23160
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
543 missing_content2_content3-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
544 missing_content2_missing-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
545 missing_content2_missing-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
546 missing_missing_content3-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
547 missing_missing_content3-untracked |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
548 missing_missing_missing-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
549 missing_missing_missing-untracked |
22127
3163b8f8ff26
test-revert: display the list of all generated cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22126
diff
changeset
|
550 |
22126
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
551 Script to make a simple text version of the content |
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
552 --------------------------------------------------- |
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
553 |
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
554 $ cat << EOF >> dircontent.py |
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
555 > # generate a simple text view of the directory for easy comparison |
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
556 > import os |
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
557 > files = os.listdir('.') |
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
558 > files.sort() |
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
559 > for filename in files: |
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
560 > if os.path.isdir(filename): |
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
561 > continue |
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
562 > content = open(filename).read() |
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
563 > print '%-6s %s' % (content.strip(), filename) |
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
564 > EOF |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
565 |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
566 Generate appropriate repo state |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
567 ------------------------------- |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
568 |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
569 $ hg init revert-ref |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
570 $ cd revert-ref |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
571 |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
572 Generate base changeset |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
573 |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
574 $ python ../gen-revert-cases.py base |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
575 $ hg addremove --similarity 0 |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
576 adding content1_content1_content1-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
577 adding content1_content1_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
578 adding content1_content1_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
579 adding content1_content1_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
580 adding content1_content1_missing-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
581 adding content1_content1_missing-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
582 adding content1_content2_content1-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
583 adding content1_content2_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
584 adding content1_content2_content2-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
585 adding content1_content2_content2-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
586 adding content1_content2_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
587 adding content1_content2_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
588 adding content1_content2_missing-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
589 adding content1_content2_missing-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
590 adding content1_missing_content1-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
591 adding content1_missing_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
592 adding content1_missing_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
593 adding content1_missing_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
594 adding content1_missing_missing-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
595 adding content1_missing_missing-untracked |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
596 $ hg status |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
597 A content1_content1_content1-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
598 A content1_content1_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
599 A content1_content1_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
600 A content1_content1_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
601 A content1_content1_missing-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
602 A content1_content1_missing-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
603 A content1_content2_content1-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
604 A content1_content2_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
605 A content1_content2_content2-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
606 A content1_content2_content2-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
607 A content1_content2_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
608 A content1_content2_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
609 A content1_content2_missing-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
610 A content1_content2_missing-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
611 A content1_missing_content1-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
612 A content1_missing_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
613 A content1_missing_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
614 A content1_missing_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
615 A content1_missing_missing-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
616 A content1_missing_missing-untracked |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
617 $ hg commit -m 'base' |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
618 |
22126
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
619 (create a simple text version of the content) |
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
620 |
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
621 $ python ../dircontent.py > ../content-base.txt |
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
622 $ cat ../content-base.txt |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
623 content1 content1_content1_content1-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
624 content1 content1_content1_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
625 content1 content1_content1_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
626 content1 content1_content1_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
627 content1 content1_content1_missing-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
628 content1 content1_content1_missing-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
629 content1 content1_content2_content1-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
630 content1 content1_content2_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
631 content1 content1_content2_content2-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
632 content1 content1_content2_content2-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
633 content1 content1_content2_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
634 content1 content1_content2_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
635 content1 content1_content2_missing-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
636 content1 content1_content2_missing-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
637 content1 content1_missing_content1-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
638 content1 content1_missing_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
639 content1 content1_missing_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
640 content1 content1_missing_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
641 content1 content1_missing_missing-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
642 content1 content1_missing_missing-untracked |
22126
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
643 |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
644 Create parent changeset |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
645 |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
646 $ python ../gen-revert-cases.py parent |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
647 $ hg addremove --similarity 0 |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
648 removing content1_missing_content1-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
649 removing content1_missing_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
650 removing content1_missing_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
651 removing content1_missing_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
652 removing content1_missing_missing-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
653 removing content1_missing_missing-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
654 adding missing_content2_content2-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
655 adding missing_content2_content2-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
656 adding missing_content2_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
657 adding missing_content2_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
658 adding missing_content2_missing-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
659 adding missing_content2_missing-untracked |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
660 $ hg status |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
661 M content1_content2_content1-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
662 M content1_content2_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
663 M content1_content2_content2-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
664 M content1_content2_content2-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
665 M content1_content2_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
666 M content1_content2_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
667 M content1_content2_missing-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
668 M content1_content2_missing-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
669 A missing_content2_content2-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
670 A missing_content2_content2-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
671 A missing_content2_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
672 A missing_content2_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
673 A missing_content2_missing-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
674 A missing_content2_missing-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
675 R content1_missing_content1-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
676 R content1_missing_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
677 R content1_missing_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
678 R content1_missing_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
679 R content1_missing_missing-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
680 R content1_missing_missing-untracked |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
681 $ hg commit -m 'parent' |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
682 |
22126
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
683 (create a simple text version of the content) |
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
684 |
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
685 $ python ../dircontent.py > ../content-parent.txt |
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
686 $ cat ../content-parent.txt |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
687 content1 content1_content1_content1-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
688 content1 content1_content1_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
689 content1 content1_content1_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
690 content1 content1_content1_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
691 content1 content1_content1_missing-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
692 content1 content1_content1_missing-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
693 content2 content1_content2_content1-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
694 content2 content1_content2_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
695 content2 content1_content2_content2-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
696 content2 content1_content2_content2-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
697 content2 content1_content2_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
698 content2 content1_content2_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
699 content2 content1_content2_missing-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
700 content2 content1_content2_missing-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
701 content2 missing_content2_content2-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
702 content2 missing_content2_content2-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
703 content2 missing_content2_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
704 content2 missing_content2_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
705 content2 missing_content2_missing-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
706 content2 missing_content2_missing-untracked |
22126
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
707 |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
708 Setup working directory |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
709 |
23134
22e76e370611
test-revert.t: fix wc check-code false positive
Matt Mackall <mpm@selenic.com>
parents:
22611
diff
changeset
|
710 $ python ../gen-revert-cases.py wc |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
711 $ hg addremove --similarity 0 |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
712 adding content1_missing_content1-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
713 adding content1_missing_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
714 adding content1_missing_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
715 adding content1_missing_content3-untracked |
23161
6f31f46b8544
test-revert: make sure all 'tracked' files are really tracked
Martin von Zweigbergk <martinvonz@google.com>
parents:
23160
diff
changeset
|
716 adding content1_missing_missing-tracked |
6f31f46b8544
test-revert: make sure all 'tracked' files are really tracked
Martin von Zweigbergk <martinvonz@google.com>
parents:
23160
diff
changeset
|
717 adding content1_missing_missing-untracked |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
718 adding missing_missing_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
719 adding missing_missing_content3-untracked |
23161
6f31f46b8544
test-revert: make sure all 'tracked' files are really tracked
Martin von Zweigbergk <martinvonz@google.com>
parents:
23160
diff
changeset
|
720 adding missing_missing_missing-tracked |
6f31f46b8544
test-revert: make sure all 'tracked' files are really tracked
Martin von Zweigbergk <martinvonz@google.com>
parents:
23160
diff
changeset
|
721 adding missing_missing_missing-untracked |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
722 $ hg forget *_*_*-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
723 $ rm *_*_missing-* |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
724 $ hg status |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
725 M content1_content1_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
726 M content1_content2_content1-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
727 M content1_content2_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
728 M missing_content2_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
729 A content1_missing_content1-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
730 A content1_missing_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
731 A missing_missing_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
732 R content1_content1_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
733 R content1_content1_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
734 R content1_content1_missing-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
735 R content1_content2_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
736 R content1_content2_content2-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
737 R content1_content2_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
738 R content1_content2_missing-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
739 R missing_content2_content2-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
740 R missing_content2_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
741 R missing_content2_missing-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
742 ! content1_content1_missing-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
743 ! content1_content2_missing-tracked |
23161
6f31f46b8544
test-revert: make sure all 'tracked' files are really tracked
Martin von Zweigbergk <martinvonz@google.com>
parents:
23160
diff
changeset
|
744 ! content1_missing_missing-tracked |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
745 ! missing_content2_missing-tracked |
23161
6f31f46b8544
test-revert: make sure all 'tracked' files are really tracked
Martin von Zweigbergk <martinvonz@google.com>
parents:
23160
diff
changeset
|
746 ! missing_missing_missing-tracked |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
747 ? content1_missing_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
748 ? content1_missing_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
749 ? missing_missing_content3-untracked |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
750 |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
751 $ hg status --rev 'desc("base")' |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
752 M content1_content1_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
753 M content1_content2_content2-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
754 M content1_content2_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
755 M content1_missing_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
756 A missing_content2_content2-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
757 A missing_content2_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
758 A missing_missing_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
759 R content1_content1_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
760 R content1_content1_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
761 R content1_content1_missing-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
762 R content1_content2_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
763 R content1_content2_content2-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
764 R content1_content2_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
765 R content1_content2_missing-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
766 R content1_missing_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
767 R content1_missing_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
768 R content1_missing_missing-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
769 R content1_missing_missing-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
770 ! content1_content1_missing-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
771 ! content1_content2_missing-tracked |
23161
6f31f46b8544
test-revert: make sure all 'tracked' files are really tracked
Martin von Zweigbergk <martinvonz@google.com>
parents:
23160
diff
changeset
|
772 ! content1_missing_missing-tracked |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
773 ! missing_content2_missing-tracked |
23161
6f31f46b8544
test-revert: make sure all 'tracked' files are really tracked
Martin von Zweigbergk <martinvonz@google.com>
parents:
23160
diff
changeset
|
774 ! missing_missing_missing-tracked |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
775 ? missing_missing_content3-untracked |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
776 |
22126
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
777 (create a simple text version of the content) |
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
778 |
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
779 $ python ../dircontent.py > ../content-wc.txt |
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
780 $ cat ../content-wc.txt |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
781 content1 content1_content1_content1-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
782 content1 content1_content1_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
783 content3 content1_content1_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
784 content3 content1_content1_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
785 content1 content1_content2_content1-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
786 content1 content1_content2_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
787 content2 content1_content2_content2-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
788 content2 content1_content2_content2-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
789 content3 content1_content2_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
790 content3 content1_content2_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
791 content1 content1_missing_content1-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
792 content1 content1_missing_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
793 content3 content1_missing_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
794 content3 content1_missing_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
795 content2 missing_content2_content2-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
796 content2 missing_content2_content2-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
797 content3 missing_content2_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
798 content3 missing_content2_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
799 content3 missing_missing_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
800 content3 missing_missing_content3-untracked |
22126
651b2149f1e7
test-revert: also create a text version of the snapshot
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22124
diff
changeset
|
801 |
22124
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
802 $ cd .. |
e51784473fc0
test-revert: prepare methodical testing of revert cases
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22123
diff
changeset
|
803 |
22128
db23fb4e210d
test-revert: add methodical revert to parent for working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22127
diff
changeset
|
804 Test revert --all to parent content |
db23fb4e210d
test-revert: add methodical revert to parent for working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22127
diff
changeset
|
805 ----------------------------------- |
db23fb4e210d
test-revert: add methodical revert to parent for working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22127
diff
changeset
|
806 |
db23fb4e210d
test-revert: add methodical revert to parent for working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22127
diff
changeset
|
807 (setup from reference repo) |
db23fb4e210d
test-revert: add methodical revert to parent for working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22127
diff
changeset
|
808 |
db23fb4e210d
test-revert: add methodical revert to parent for working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22127
diff
changeset
|
809 $ cp -r revert-ref revert-parent-all |
db23fb4e210d
test-revert: add methodical revert to parent for working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22127
diff
changeset
|
810 $ cd revert-parent-all |
db23fb4e210d
test-revert: add methodical revert to parent for working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22127
diff
changeset
|
811 |
db23fb4e210d
test-revert: add methodical revert to parent for working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22127
diff
changeset
|
812 check revert output |
db23fb4e210d
test-revert: add methodical revert to parent for working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22127
diff
changeset
|
813 |
db23fb4e210d
test-revert: add methodical revert to parent for working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22127
diff
changeset
|
814 $ hg revert --all |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
815 undeleting content1_content1_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
816 reverting content1_content1_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
817 undeleting content1_content1_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
818 reverting content1_content1_missing-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
819 undeleting content1_content1_missing-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
820 reverting content1_content2_content1-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
821 undeleting content1_content2_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
822 undeleting content1_content2_content2-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
823 reverting content1_content2_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
824 undeleting content1_content2_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
825 reverting content1_content2_missing-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
826 undeleting content1_content2_missing-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
827 forgetting content1_missing_content1-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
828 forgetting content1_missing_content3-tracked |
23161
6f31f46b8544
test-revert: make sure all 'tracked' files are really tracked
Martin von Zweigbergk <martinvonz@google.com>
parents:
23160
diff
changeset
|
829 forgetting content1_missing_missing-tracked |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
830 undeleting missing_content2_content2-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
831 reverting missing_content2_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
832 undeleting missing_content2_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
833 reverting missing_content2_missing-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
834 undeleting missing_content2_missing-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
835 forgetting missing_missing_content3-tracked |
23161
6f31f46b8544
test-revert: make sure all 'tracked' files are really tracked
Martin von Zweigbergk <martinvonz@google.com>
parents:
23160
diff
changeset
|
836 forgetting missing_missing_missing-tracked |
22128
db23fb4e210d
test-revert: add methodical revert to parent for working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22127
diff
changeset
|
837 |
db23fb4e210d
test-revert: add methodical revert to parent for working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22127
diff
changeset
|
838 Compare resulting directory with revert target. |
db23fb4e210d
test-revert: add methodical revert to parent for working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22127
diff
changeset
|
839 |
db23fb4e210d
test-revert: add methodical revert to parent for working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22127
diff
changeset
|
840 The diff is filtered to include change only. The only difference should be |
db23fb4e210d
test-revert: add methodical revert to parent for working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22127
diff
changeset
|
841 additional `.orig` backup file when applicable. |
db23fb4e210d
test-revert: add methodical revert to parent for working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22127
diff
changeset
|
842 |
db23fb4e210d
test-revert: add methodical revert to parent for working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22127
diff
changeset
|
843 $ python ../dircontent.py > ../content-parent-all.txt |
db23fb4e210d
test-revert: add methodical revert to parent for working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22127
diff
changeset
|
844 $ cd .. |
db23fb4e210d
test-revert: add methodical revert to parent for working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22127
diff
changeset
|
845 $ diff -U 0 -- content-parent.txt content-parent-all.txt | grep _ |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
846 +content3 content1_content1_content3-tracked.orig |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
847 +content3 content1_content1_content3-untracked.orig |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
848 +content1 content1_content2_content1-tracked.orig |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
849 +content1 content1_content2_content1-untracked.orig |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
850 +content3 content1_content2_content3-tracked.orig |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
851 +content3 content1_content2_content3-untracked.orig |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
852 +content1 content1_missing_content1-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
853 +content1 content1_missing_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
854 +content3 content1_missing_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
855 +content3 content1_missing_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
856 +content3 missing_content2_content3-tracked.orig |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
857 +content3 missing_content2_content3-untracked.orig |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
858 +content3 missing_missing_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
859 +content3 missing_missing_content3-untracked |
22129
f0147ff1109f
test-revert: add methodical revert to "base"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22128
diff
changeset
|
860 |
f0147ff1109f
test-revert: add methodical revert to "base"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22128
diff
changeset
|
861 Test revert --all to "base" content |
f0147ff1109f
test-revert: add methodical revert to "base"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22128
diff
changeset
|
862 ----------------------------------- |
f0147ff1109f
test-revert: add methodical revert to "base"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22128
diff
changeset
|
863 |
f0147ff1109f
test-revert: add methodical revert to "base"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22128
diff
changeset
|
864 (setup from reference repo) |
f0147ff1109f
test-revert: add methodical revert to "base"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22128
diff
changeset
|
865 |
f0147ff1109f
test-revert: add methodical revert to "base"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22128
diff
changeset
|
866 $ cp -r revert-ref revert-base-all |
f0147ff1109f
test-revert: add methodical revert to "base"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22128
diff
changeset
|
867 $ cd revert-base-all |
f0147ff1109f
test-revert: add methodical revert to "base"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22128
diff
changeset
|
868 |
f0147ff1109f
test-revert: add methodical revert to "base"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22128
diff
changeset
|
869 check revert output |
f0147ff1109f
test-revert: add methodical revert to "base"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22128
diff
changeset
|
870 |
f0147ff1109f
test-revert: add methodical revert to "base"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22128
diff
changeset
|
871 $ hg revert --all --rev 'desc(base)' |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
872 undeleting content1_content1_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
873 reverting content1_content1_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
874 undeleting content1_content1_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
875 reverting content1_content1_missing-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
876 undeleting content1_content1_missing-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
877 undeleting content1_content2_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
878 reverting content1_content2_content2-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
879 undeleting content1_content2_content2-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
880 reverting content1_content2_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
881 undeleting content1_content2_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
882 reverting content1_content2_missing-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
883 undeleting content1_content2_missing-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
884 adding content1_missing_content1-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
885 reverting content1_missing_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
886 adding content1_missing_content3-untracked |
23161
6f31f46b8544
test-revert: make sure all 'tracked' files are really tracked
Martin von Zweigbergk <martinvonz@google.com>
parents:
23160
diff
changeset
|
887 reverting content1_missing_missing-tracked |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
888 adding content1_missing_missing-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
889 removing missing_content2_content2-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
890 removing missing_content2_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
891 removing missing_content2_missing-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
892 forgetting missing_missing_content3-tracked |
23161
6f31f46b8544
test-revert: make sure all 'tracked' files are really tracked
Martin von Zweigbergk <martinvonz@google.com>
parents:
23160
diff
changeset
|
893 forgetting missing_missing_missing-tracked |
22129
f0147ff1109f
test-revert: add methodical revert to "base"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22128
diff
changeset
|
894 |
f0147ff1109f
test-revert: add methodical revert to "base"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22128
diff
changeset
|
895 Compare resulting directory with revert target. |
f0147ff1109f
test-revert: add methodical revert to "base"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22128
diff
changeset
|
896 |
f0147ff1109f
test-revert: add methodical revert to "base"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22128
diff
changeset
|
897 The diff is filtered to include change only. The only difference should be |
f0147ff1109f
test-revert: add methodical revert to "base"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22128
diff
changeset
|
898 additional `.orig` backup file when applicable. |
f0147ff1109f
test-revert: add methodical revert to "base"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22128
diff
changeset
|
899 |
f0147ff1109f
test-revert: add methodical revert to "base"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22128
diff
changeset
|
900 $ python ../dircontent.py > ../content-base-all.txt |
f0147ff1109f
test-revert: add methodical revert to "base"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22128
diff
changeset
|
901 $ cd .. |
f0147ff1109f
test-revert: add methodical revert to "base"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22128
diff
changeset
|
902 $ diff -U 0 -- content-base.txt content-base-all.txt | grep _ |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
903 +content3 content1_content1_content3-tracked.orig |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
904 +content3 content1_content1_content3-untracked.orig |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
905 +content2 content1_content2_content2-untracked.orig |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
906 +content3 content1_content2_content3-tracked.orig |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
907 +content3 content1_content2_content3-untracked.orig |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
908 +content3 content1_missing_content3-tracked.orig |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
909 +content3 content1_missing_content3-untracked.orig |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
910 +content2 missing_content2_content2-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
911 +content3 missing_content2_content3-tracked.orig |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
912 +content3 missing_content2_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
913 +content3 missing_missing_content3-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
914 +content3 missing_missing_content3-untracked |
22130
78abb9a42830
test-revert: add methodical revert with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22129
diff
changeset
|
915 |
78abb9a42830
test-revert: add methodical revert with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22129
diff
changeset
|
916 Test revert to parent content with explicit file name |
78abb9a42830
test-revert: add methodical revert with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22129
diff
changeset
|
917 ----------------------------------------------------- |
78abb9a42830
test-revert: add methodical revert with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22129
diff
changeset
|
918 |
78abb9a42830
test-revert: add methodical revert with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22129
diff
changeset
|
919 (setup from reference repo) |
78abb9a42830
test-revert: add methodical revert with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22129
diff
changeset
|
920 |
78abb9a42830
test-revert: add methodical revert with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22129
diff
changeset
|
921 $ cp -r revert-ref revert-parent-explicit |
78abb9a42830
test-revert: add methodical revert with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22129
diff
changeset
|
922 $ cd revert-parent-explicit |
78abb9a42830
test-revert: add methodical revert with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22129
diff
changeset
|
923 |
78abb9a42830
test-revert: add methodical revert with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22129
diff
changeset
|
924 revert all files individually and check the output |
78abb9a42830
test-revert: add methodical revert with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22129
diff
changeset
|
925 (output is expected to be different than in the --all case) |
78abb9a42830
test-revert: add methodical revert with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22129
diff
changeset
|
926 |
78abb9a42830
test-revert: add methodical revert with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22129
diff
changeset
|
927 $ for file in `python ../gen-revert-cases.py filelist`; do |
78abb9a42830
test-revert: add methodical revert with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22129
diff
changeset
|
928 > echo '### revert for:' $file; |
78abb9a42830
test-revert: add methodical revert with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22129
diff
changeset
|
929 > hg revert $file; |
78abb9a42830
test-revert: add methodical revert with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22129
diff
changeset
|
930 > echo |
78abb9a42830
test-revert: add methodical revert with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22129
diff
changeset
|
931 > done |
23160
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
932 ### revert for: content1_content1_content1-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
933 no changes needed to content1_content1_content1-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
934 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
935 ### revert for: content1_content1_content1-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
936 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
937 ### revert for: content1_content1_content3-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
938 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
939 ### revert for: content1_content1_content3-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
940 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
941 ### revert for: content1_content1_missing-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
942 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
943 ### revert for: content1_content1_missing-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
944 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
945 ### revert for: content1_content2_content1-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
946 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
947 ### revert for: content1_content2_content1-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
948 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
949 ### revert for: content1_content2_content2-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
950 no changes needed to content1_content2_content2-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
951 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
952 ### revert for: content1_content2_content2-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
953 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
954 ### revert for: content1_content2_content3-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
955 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
956 ### revert for: content1_content2_content3-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
957 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
958 ### revert for: content1_content2_missing-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
959 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
960 ### revert for: content1_content2_missing-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
961 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
962 ### revert for: content1_missing_content1-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
963 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
964 ### revert for: content1_missing_content1-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
965 file not managed: content1_missing_content1-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
966 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
967 ### revert for: content1_missing_content3-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
968 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
969 ### revert for: content1_missing_content3-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
970 file not managed: content1_missing_content3-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
971 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
972 ### revert for: content1_missing_missing-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
973 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
974 ### revert for: content1_missing_missing-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
975 content1_missing_missing-untracked: no such file in rev * (glob) |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
976 |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
977 ### revert for: missing_content2_content2-tracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
978 no changes needed to missing_content2_content2-tracked |
22133
d732ff677b96
test-revert: add case where file is added between "base" and "parent"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22131
diff
changeset
|
979 |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
980 ### revert for: missing_content2_content2-untracked |
22140
74e932047975
test-revert: add case where the file is marked as removed in the wc
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22139
diff
changeset
|
981 |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
982 ### revert for: missing_content2_content3-tracked |
22139
1ecd6f1f9869
test-revert: add case where wc content is different from "base" and "parent"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22138
diff
changeset
|
983 |
23160
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
984 ### revert for: missing_content2_content3-untracked |
22135
37d2bd2c04f6
test-revert: add case where file is unchanged between "base" and "parent"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22133
diff
changeset
|
985 |
23160
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
986 ### revert for: missing_content2_missing-tracked |
22144
b7c9f07b76c1
test-revert: add case where file is tracked but deleted in working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22143
diff
changeset
|
987 |
23160
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
988 ### revert for: missing_content2_missing-untracked |
22141
6b522c1139a9
test-revert: add case where file exists but is untracked in working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22140
diff
changeset
|
989 |
23160
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
990 ### revert for: missing_missing_content3-tracked |
22143
ca278b893940
test-revert: add case with untracked files with unique content
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22142
diff
changeset
|
991 |
23160
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
992 ### revert for: missing_missing_content3-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
993 file not managed: missing_missing_content3-untracked |
22139
1ecd6f1f9869
test-revert: add case where wc content is different from "base" and "parent"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22138
diff
changeset
|
994 |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
995 ### revert for: missing_missing_missing-tracked |
22137
2cfe5ec47803
test-revert: add case where file exists neither in "base" nor in "parent"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22136
diff
changeset
|
996 |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
997 ### revert for: missing_missing_missing-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
998 missing_missing_missing-untracked: no such file in rev * (glob) |
22141
6b522c1139a9
test-revert: add case where file exists but is untracked in working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22140
diff
changeset
|
999 |
22130
78abb9a42830
test-revert: add methodical revert with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22129
diff
changeset
|
1000 |
23139
e53f6b72a0e4
spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents:
23135
diff
changeset
|
1001 check resulting directory against the --all run |
22130
78abb9a42830
test-revert: add methodical revert with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22129
diff
changeset
|
1002 (There should be no difference) |
78abb9a42830
test-revert: add methodical revert with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22129
diff
changeset
|
1003 |
78abb9a42830
test-revert: add methodical revert with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22129
diff
changeset
|
1004 $ python ../dircontent.py > ../content-parent-explicit.txt |
78abb9a42830
test-revert: add methodical revert with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22129
diff
changeset
|
1005 $ cd .. |
78abb9a42830
test-revert: add methodical revert with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22129
diff
changeset
|
1006 $ diff -U 0 -- content-parent-all.txt content-parent-explicit.txt | grep _ |
78abb9a42830
test-revert: add methodical revert with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22129
diff
changeset
|
1007 [1] |
22131
8768342af0cd
test-revert: add methodical revert to "base" with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22130
diff
changeset
|
1008 |
8768342af0cd
test-revert: add methodical revert to "base" with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22130
diff
changeset
|
1009 Test revert to "base" content with explicit file name |
8768342af0cd
test-revert: add methodical revert to "base" with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22130
diff
changeset
|
1010 ----------------------------------------------------- |
8768342af0cd
test-revert: add methodical revert to "base" with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22130
diff
changeset
|
1011 |
8768342af0cd
test-revert: add methodical revert to "base" with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22130
diff
changeset
|
1012 (setup from reference repo) |
8768342af0cd
test-revert: add methodical revert to "base" with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22130
diff
changeset
|
1013 |
8768342af0cd
test-revert: add methodical revert to "base" with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22130
diff
changeset
|
1014 $ cp -r revert-ref revert-base-explicit |
8768342af0cd
test-revert: add methodical revert to "base" with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22130
diff
changeset
|
1015 $ cd revert-base-explicit |
8768342af0cd
test-revert: add methodical revert to "base" with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22130
diff
changeset
|
1016 |
8768342af0cd
test-revert: add methodical revert to "base" with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22130
diff
changeset
|
1017 revert all files individually and check the output |
8768342af0cd
test-revert: add methodical revert to "base" with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22130
diff
changeset
|
1018 (output is expected to be different than in the --all case) |
8768342af0cd
test-revert: add methodical revert to "base" with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22130
diff
changeset
|
1019 |
8768342af0cd
test-revert: add methodical revert to "base" with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22130
diff
changeset
|
1020 $ for file in `python ../gen-revert-cases.py filelist`; do |
8768342af0cd
test-revert: add methodical revert to "base" with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22130
diff
changeset
|
1021 > echo '### revert for:' $file; |
8768342af0cd
test-revert: add methodical revert to "base" with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22130
diff
changeset
|
1022 > hg revert $file --rev 'desc(base)'; |
8768342af0cd
test-revert: add methodical revert to "base" with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22130
diff
changeset
|
1023 > echo |
8768342af0cd
test-revert: add methodical revert to "base" with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22130
diff
changeset
|
1024 > done |
23160
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1025 ### revert for: content1_content1_content1-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1026 no changes needed to content1_content1_content1-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1027 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1028 ### revert for: content1_content1_content1-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1029 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1030 ### revert for: content1_content1_content3-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1031 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1032 ### revert for: content1_content1_content3-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1033 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1034 ### revert for: content1_content1_missing-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1035 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1036 ### revert for: content1_content1_missing-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1037 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1038 ### revert for: content1_content2_content1-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1039 no changes needed to content1_content2_content1-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1040 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1041 ### revert for: content1_content2_content1-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1042 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1043 ### revert for: content1_content2_content2-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1044 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1045 ### revert for: content1_content2_content2-untracked |
22133
d732ff677b96
test-revert: add case where file is added between "base" and "parent"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22131
diff
changeset
|
1046 |
23160
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1047 ### revert for: content1_content2_content3-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1048 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1049 ### revert for: content1_content2_content3-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1050 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1051 ### revert for: content1_content2_missing-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1052 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1053 ### revert for: content1_content2_missing-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1054 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1055 ### revert for: content1_missing_content1-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1056 no changes needed to content1_missing_content1-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1057 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1058 ### revert for: content1_missing_content1-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1059 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1060 ### revert for: content1_missing_content3-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1061 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1062 ### revert for: content1_missing_content3-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1063 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1064 ### revert for: content1_missing_missing-tracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1065 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1066 ### revert for: content1_missing_missing-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1067 |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1068 ### revert for: missing_content2_content2-tracked |
22144
b7c9f07b76c1
test-revert: add case where file is tracked but deleted in working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22143
diff
changeset
|
1069 |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
1070 ### revert for: missing_content2_content2-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
1071 no changes needed to missing_content2_content2-untracked |
22141
6b522c1139a9
test-revert: add case where file exists but is untracked in working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22140
diff
changeset
|
1072 |
23160
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1073 ### revert for: missing_content2_content3-tracked |
23156
e630c176ceda
test-revert: replace 'removed' in working copy with 'untracked-deleted'
Martin von Zweigbergk <martinvonz@google.com>
parents:
23155
diff
changeset
|
1074 |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
1075 ### revert for: missing_content2_content3-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
1076 no changes needed to missing_content2_content3-untracked |
22143
ca278b893940
test-revert: add case with untracked files with unique content
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22142
diff
changeset
|
1077 |
23160
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1078 ### revert for: missing_content2_missing-tracked |
22139
1ecd6f1f9869
test-revert: add case where wc content is different from "base" and "parent"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22138
diff
changeset
|
1079 |
23160
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1080 ### revert for: missing_content2_missing-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1081 no changes needed to missing_content2_missing-untracked |
22144
b7c9f07b76c1
test-revert: add case where file is tracked but deleted in working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22143
diff
changeset
|
1082 |
23160
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1083 ### revert for: missing_missing_content3-tracked |
22141
6b522c1139a9
test-revert: add case where file exists but is untracked in working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22140
diff
changeset
|
1084 |
23160
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1085 ### revert for: missing_missing_content3-untracked |
4f4e6815f286
test-revert: sort by output filename again
Martin von Zweigbergk <martinvonz@google.com>
parents:
23159
diff
changeset
|
1086 file not managed: missing_missing_content3-untracked |
22139
1ecd6f1f9869
test-revert: add case where wc content is different from "base" and "parent"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22138
diff
changeset
|
1087 |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
1088 ### revert for: missing_missing_missing-tracked |
22137
2cfe5ec47803
test-revert: add case where file exists neither in "base" nor in "parent"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22136
diff
changeset
|
1089 |
23159
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
1090 ### revert for: missing_missing_missing-untracked |
20d3e2d73432
test-revert: name files by state, not by state transition
Martin von Zweigbergk <martinvonz@google.com>
parents:
23158
diff
changeset
|
1091 missing_missing_missing-untracked: no such file in rev * (glob) |
22141
6b522c1139a9
test-revert: add case where file exists but is untracked in working directory
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22140
diff
changeset
|
1092 |
22131
8768342af0cd
test-revert: add methodical revert to "base" with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22130
diff
changeset
|
1093 |
23139
e53f6b72a0e4
spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents:
23135
diff
changeset
|
1094 check resulting directory against the --all run |
22131
8768342af0cd
test-revert: add methodical revert to "base" with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22130
diff
changeset
|
1095 (There should be no difference) |
8768342af0cd
test-revert: add methodical revert to "base" with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22130
diff
changeset
|
1096 |
8768342af0cd
test-revert: add methodical revert to "base" with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22130
diff
changeset
|
1097 $ python ../dircontent.py > ../content-base-explicit.txt |
8768342af0cd
test-revert: add methodical revert to "base" with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22130
diff
changeset
|
1098 $ cd .. |
8768342af0cd
test-revert: add methodical revert to "base" with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22130
diff
changeset
|
1099 $ diff -U 0 -- content-base-all.txt content-base-explicit.txt | grep _ |
8768342af0cd
test-revert: add methodical revert to "base" with explicit file path
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22130
diff
changeset
|
1100 [1] |