annotate tests/test-backwards-remove.t @ 46580:2076df13d00f

copies-rust: refactor the "deletion" case We rearrange the code to single out the case where information need to be overwritten on both side of the merge. This open the way to better dealing with this case. Differential Revision: https://phab.mercurial-scm.org/D9651
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 16 Dec 2020 10:59:00 +0100
parents 5c2a4f37eace
children 55c6ebd11cb9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11857
9661514f85ae tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents: 1933
diff changeset
1 $ hg init
9661514f85ae tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents: 1933
diff changeset
2 $ echo This is file a1 > a
9661514f85ae tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents: 1933
diff changeset
3 $ hg add a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11857
diff changeset
4 $ hg commit -m "commit #0"
44724
5c2a4f37eace tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents: 12156
diff changeset
5 $ ls -A
5c2a4f37eace tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents: 12156
diff changeset
6 .hg
11857
9661514f85ae tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents: 1933
diff changeset
7 a
9661514f85ae tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents: 1933
diff changeset
8 $ echo This is file b1 > b
9661514f85ae tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents: 1933
diff changeset
9 $ hg add b
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11857
diff changeset
10 $ hg commit -m "commit #1"
11857
9661514f85ae tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents: 1933
diff changeset
11 $ hg co 0
9661514f85ae tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents: 1933
diff changeset
12 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
9661514f85ae tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents: 1933
diff changeset
13
9661514f85ae tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents: 1933
diff changeset
14 B should disappear
9661514f85ae tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents: 1933
diff changeset
15
44724
5c2a4f37eace tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents: 12156
diff changeset
16 $ ls -A
5c2a4f37eace tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
Joerg Sonnenberger <joerg@bec.de>
parents: 12156
diff changeset
17 .hg
11857
9661514f85ae tests: unify test-backwards-remove
Martin Geisler <mg@lazybytes.net>
parents: 1933
diff changeset
18 a