Mercurial > hg
annotate tests/test-merge-revert2.t @ 49762:c4d587fa161c
peer: pass the `path` to the statichttp peer
We now have all peer able to receive and store a `path` object. Hooray.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 02 Dec 2022 19:34:01 +0100 |
| parents | 55c6ebd11cb9 |
| children |
| rev | line source |
|---|---|
|
49621
55c6ebd11cb9
tests: run many tests in $TESTTMP/repo instead of $TESTTMP
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
30460
diff
changeset
|
1 $ hg init repo |
|
55c6ebd11cb9
tests: run many tests in $TESTTMP/repo instead of $TESTTMP
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
30460
diff
changeset
|
2 $ cd repo |
| 12279 | 3 |
| 4 $ echo "added file1" > file1 | |
| 5 $ echo "another line of text" >> file1 | |
| 6 $ echo "added file2" > file2 | |
| 7 $ hg add file1 file2 | |
| 8 $ hg commit -m "added file1 and file2" | |
| 9 | |
| 10 $ echo "changed file1" >> file1 | |
| 11 $ hg commit -m "changed file1" | |
| 12 | |
| 13 $ hg -q log | |
| 14 1:dfab7f3c2efb | |
| 15 0:c3fa057dd86f | |
| 16 $ hg id | |
| 17 dfab7f3c2efb tip | |
| 18 | |
| 19 $ hg update -C 0 | |
| 20 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 21 $ hg id | |
| 22 c3fa057dd86f | |
| 23 | |
| 24 $ echo "changed file1" >> file1 | |
| 25 $ hg id | |
| 26 c3fa057dd86f+ | |
| 27 | |
| 28 $ hg revert --no-backup --all | |
| 29 reverting file1 | |
| 30 $ hg diff | |
| 31 $ hg status | |
| 32 $ hg id | |
| 33 c3fa057dd86f | |
| 34 | |
| 35 $ hg update | |
| 36 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 37 $ hg diff | |
| 38 $ hg status | |
| 39 $ hg id | |
| 40 dfab7f3c2efb tip | |
| 41 | |
| 42 $ hg update -C 0 | |
| 43 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 44 $ echo "changed file1 different" >> file1 | |
|
792
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
45 |
| 12279 | 46 $ hg update |
| 47 merging file1 | |
|
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
21693
diff
changeset
|
48 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark') |
| 12279 | 49 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 50 use 'hg resolve' to retry unresolved file merges | |
|
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12279
diff
changeset
|
51 [1] |
| 12279 | 52 |
| 53 $ hg diff --nodates | |
| 54 diff -r dfab7f3c2efb file1 | |
| 55 --- a/file1 | |
| 56 +++ b/file1 | |
| 57 @@ -1,3 +1,7 @@ | |
| 58 added file1 | |
| 59 another line of text | |
|
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
26614
diff
changeset
|
60 +<<<<<<< working copy: c3fa057dd86f - test: added file1 and file2 |
| 12279 | 61 +changed file1 different |
| 62 +======= | |
| 63 changed file1 | |
|
21693
9c35f3a8cac4
merge: drop the quotes around commit description
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21537
diff
changeset
|
64 +>>>>>>> destination: dfab7f3c2efb - test: changed file1 |
|
792
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
65 |
| 12279 | 66 $ hg status |
| 67 M file1 | |
| 68 ? file1.orig | |
| 69 $ hg id | |
| 70 dfab7f3c2efb+ tip | |
| 71 | |
| 72 $ hg revert --no-backup --all | |
| 73 reverting file1 | |
| 74 $ hg diff | |
| 75 $ hg status | |
| 76 ? file1.orig | |
| 77 $ hg id | |
| 78 dfab7f3c2efb tip | |
| 79 | |
| 80 $ hg revert -r tip --no-backup --all | |
| 81 $ hg diff | |
| 82 $ hg status | |
| 83 ? file1.orig | |
| 84 $ hg id | |
| 85 dfab7f3c2efb tip | |
| 86 | |
| 87 $ hg update -C | |
| 88 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 89 $ hg diff | |
| 90 $ hg status | |
| 91 ? file1.orig | |
| 92 $ hg id | |
| 93 dfab7f3c2efb tip | |
| 94 |