Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-addremove @ 5483:0c43f87baba3 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 27 Oct 2007 16:27:55 +0400
parents f975e986b4bf
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1623
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
1 #!/bin/sh
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
2
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
3 hg init rep
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
4 cd rep
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
5 mkdir dir
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
6 touch foo dir/bar
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
7 hg -v addremove
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1623
diff changeset
8 hg -v commit -m "add 1" -d "1000000 0"
1623
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
9 cd dir/
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
10 touch ../foo_2 bar_2
eef8ff46567a Added test for the currently broken addremove with the expected output.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff changeset
11 hg -v addremove
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1623
diff changeset
12 hg -v commit -m "add 2" -d "1000000 0"
2958
ff3ea21a981a addremove: add -s/--similarity option
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset
13
ff3ea21a981a addremove: add -s/--similarity option
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset
14 cd ..
ff3ea21a981a addremove: add -s/--similarity option
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset
15 hg init sim
ff3ea21a981a addremove: add -s/--similarity option
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset
16 cd sim
ff3ea21a981a addremove: add -s/--similarity option
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset
17 echo a > a
ff3ea21a981a addremove: add -s/--similarity option
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset
18 echo a >> a
ff3ea21a981a addremove: add -s/--similarity option
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset
19 echo a >> a
ff3ea21a981a addremove: add -s/--similarity option
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset
20 echo c > c
ff3ea21a981a addremove: add -s/--similarity option
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset
21 hg commit -Ama
ff3ea21a981a addremove: add -s/--similarity option
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset
22 mv a b
ff3ea21a981a addremove: add -s/--similarity option
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset
23 rm c
ff3ea21a981a addremove: add -s/--similarity option
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset
24 echo d > d
4472
f975e986b4bf Corrected similarity parameter used in test-addremove
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2958
diff changeset
25 hg addremove -s 50
2958
ff3ea21a981a addremove: add -s/--similarity option
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset
26 hg commit -mb