Mercurial > hg
annotate tests/test-merge-revert.t @ 50751:0a55206c5a1e
branching: merge stable into default
| author | Raphaël Gomès <rgomes@octobus.net> |
|---|---|
| date | Thu, 06 Jul 2023 16:07:34 +0200 |
| parents | 55c6ebd11cb9 |
| children |
| rev | line source |
|---|---|
|
49621
55c6ebd11cb9
tests: run many tests in $TESTTMP/repo instead of $TESTTMP
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
12279
diff
changeset
|
1 $ hg init repo |
|
55c6ebd11cb9
tests: run many tests in $TESTTMP/repo instead of $TESTTMP
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents:
12279
diff
changeset
|
2 $ cd repo |
| 12279 | 3 |
| 4 $ echo "added file1" > file1 | |
| 5 $ echo "added file2" > file2 | |
| 6 $ hg add file1 file2 | |
| 7 $ hg commit -m "added file1 and file2" | |
| 8 | |
| 9 $ echo "changed file1" >> file1 | |
| 10 $ hg commit -m "changed file1" | |
| 11 | |
| 12 $ hg -q log | |
| 13 1:08a16e8e4408 | |
| 14 0:d29c767a4b52 | |
| 15 $ hg id | |
| 16 08a16e8e4408 tip | |
| 17 | |
| 18 $ hg update -C 0 | |
| 19 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 20 $ hg id | |
| 21 d29c767a4b52 | |
| 22 $ echo "changed file1" >> file1 | |
| 23 $ hg id | |
| 24 d29c767a4b52+ | |
| 25 | |
| 26 $ hg revert --all | |
| 27 reverting file1 | |
| 28 $ hg diff | |
| 29 $ hg status | |
| 30 ? file1.orig | |
| 31 $ hg id | |
| 32 d29c767a4b52 | |
|
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
|
33 |
| 12279 | 34 $ hg update |
| 35 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 36 $ hg diff | |
| 37 $ hg status | |
| 38 ? file1.orig | |
| 39 $ hg id | |
| 40 08a16e8e4408 tip | |
| 41 | |
| 42 $ hg update -C 0 | |
| 43 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 44 $ echo "changed file1" >> file1 | |
| 45 | |
| 46 $ hg update | |
| 47 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 48 $ hg diff | |
| 49 $ hg status | |
| 50 ? file1.orig | |
| 51 $ hg id | |
| 52 08a16e8e4408 tip | |
|
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
|
53 |
| 12279 | 54 $ hg revert --all |
| 55 $ hg diff | |
| 56 $ hg status | |
| 57 ? file1.orig | |
| 58 $ hg id | |
| 59 08a16e8e4408 tip | |
| 60 | |
| 61 $ hg revert -r tip --all | |
| 62 $ hg diff | |
| 63 $ hg status | |
| 64 ? file1.orig | |
| 65 $ hg id | |
| 66 08a16e8e4408 tip | |
| 67 | |
| 68 $ hg update -C | |
| 69 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 70 $ hg diff | |
| 71 $ hg status | |
| 72 ? file1.orig | |
| 73 $ hg id | |
| 74 08a16e8e4408 tip | |
| 75 |