Mercurial > hg
annotate tests/test-confused-revert @ 6543:a6e2e60b34d0
convert: handle past or foreign partial svn copies
Subversion allows revisions to be composed of subparts coming from revisions
before the parent or from other part of the repository. There is no simple
representation for these now, keep the changes but do not track their origins.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 14 Apr 2008 22:31:34 +0200 |
parents | 890e285c52a1 |
children | 4c94b6d0fb1c |
rev | line source |
---|---|
1449
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
1 #!/bin/sh |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
2 |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
3 hg init |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
4 echo foo > a |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
5 hg add a |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1449
diff
changeset
|
6 hg commit -m "1" -d "1000000 0" |
1449
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
7 |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
8 echo bar > b |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
9 hg add b |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
10 hg remove a |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
11 |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
12 echo "%%% should show a removed and b added" |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
13 hg status |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
14 |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
15 echo "reverting..." |
2982
890e285c52a1
revert: require --all to revert all files.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2283
diff
changeset
|
16 hg revert --all |
1449
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
17 |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
18 echo "%%% should show b unknown and a back to normal" |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
19 hg status |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
20 |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
21 rm b |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
22 |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
23 hg co -C 0 |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
24 echo foo-a > a |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1449
diff
changeset
|
25 hg commit -m "2a" -d "1000000 0" |
1449
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
26 |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
27 hg co -C 0 |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
28 echo foo-b > a |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1449
diff
changeset
|
29 hg commit -m "2b" -d "1000000 0" |
1449
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
30 |
2283
e506c14382fd
deprecate 'update -m'. use 'merge' instead.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2214
diff
changeset
|
31 HGMERGE=true hg merge 1 |
1449
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
32 |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
33 echo "%%% should show foo-b" |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
34 cat a |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
35 |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
36 echo bar > b |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
37 hg add b |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
38 rm a |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
39 hg remove a |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
40 |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
41 echo "%%% should show a removed and b added" |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
42 hg status |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
43 |
2214
6c6c0e5595a2
make test-confused-revert check working dir with two parents.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
44 echo "%%% revert should fail" |
2982
890e285c52a1
revert: require --all to revert all files.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2283
diff
changeset
|
45 hg revert --all |
1449
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
46 |
2214
6c6c0e5595a2
make test-confused-revert check working dir with two parents.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
47 echo "%%% revert should be ok now" |
2982
890e285c52a1
revert: require --all to revert all files.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
2283
diff
changeset
|
48 hg revert -r2 --all |
2214
6c6c0e5595a2
make test-confused-revert check working dir with two parents.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
49 |
1449
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
50 echo "%%% should show b unknown and a marked modified (merged)" |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
51 hg status |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
52 |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
53 echo "%%% should show foo-b" |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
54 cat a |
30146be3437c
Add test-confused-revert, fix permissions on test-revert
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
55 |