tests/test-rawcommit1
author Maxim Dounin <mdounin@mdounin.ru>
Sat, 27 Oct 2007 16:27:55 +0400
changeset 5483 0c43f87baba3
parent 3736 ad3d5b4367cb
permissions -rwxr-xr-x
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
800
ec85f9e6f3b1 Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset
     1
#!/bin/sh
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 444
diff changeset
     2
hg --debug init
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
     3
echo this is a1 > a
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 444
diff changeset
     4
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: 1308
diff changeset
     5
hg commit -m0 -d "1000000 0"
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
     6
echo this is b1 > b
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 444
diff changeset
     7
hg add b
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1308
diff changeset
     8
hg commit -m1 -d "1000000 0"
3736
ad3d5b4367cb make manifest friendlier
Matt Mackall <mpm@selenic.com>
parents: 3375
diff changeset
     9
hg manifest --debug 1
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    10
echo this is c1 > c
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1308
diff changeset
    11
hg rawcommit -p 1 -d "1000000 0" -m2 c
3736
ad3d5b4367cb make manifest friendlier
Matt Mackall <mpm@selenic.com>
parents: 3375
diff changeset
    12
hg manifest --debug 2
3375
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
    13
hg -v parents
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    14
rm b
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1308
diff changeset
    15
hg rawcommit -p 2 -d "1000000 0" -m3 b
3736
ad3d5b4367cb make manifest friendlier
Matt Mackall <mpm@selenic.com>
parents: 3375
diff changeset
    16
hg manifest --debug 3
3375
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
    17
hg -v parents
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    18
echo this is a22 > a
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1308
diff changeset
    19
hg rawcommit -p 3 -d "1000000 0" -m4 a
3736
ad3d5b4367cb make manifest friendlier
Matt Mackall <mpm@selenic.com>
parents: 3375
diff changeset
    20
hg manifest --debug 4
3375
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
    21
hg -v parents
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    22
echo this is c22 > c
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1308
diff changeset
    23
hg rawcommit -p 1 -d "1000000 0" -m5 c
3736
ad3d5b4367cb make manifest friendlier
Matt Mackall <mpm@selenic.com>
parents: 3375
diff changeset
    24
hg manifest --debug 5
3375
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
    25
hg -v parents
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    26
# merge, but no files changed
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1308
diff changeset
    27
hg rawcommit -p 4 -p 5 -d "1000000 0" -m6
3736
ad3d5b4367cb make manifest friendlier
Matt Mackall <mpm@selenic.com>
parents: 3375
diff changeset
    28
hg manifest --debug 6
3375
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
    29
hg -v parents
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    30
# no changes what-so-ever
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1308
diff changeset
    31
hg rawcommit -p 6 -d "1000000 0" -m7
3736
ad3d5b4367cb make manifest friendlier
Matt Mackall <mpm@selenic.com>
parents: 3375
diff changeset
    32
hg manifest --debug 7
3375
9fe62e2db71d rawcommit: add removed files to the changelog file list
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1933
diff changeset
    33
hg -v parents