Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-mq-qsave @ 5483:0c43f87baba3 default tip
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 | 61fcd9fac434 |
children |
rev | line source |
---|---|
2806
ff3edd1c1e27
Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
1 #!/bin/sh |
ff3edd1c1e27
Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
2 |
2976
61fcd9fac434
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2809
diff
changeset
|
3 echo "[extensions]" >> $HGRCPATH |
61fcd9fac434
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2809
diff
changeset
|
4 echo "mq=" >> $HGRCPATH |
2806
ff3edd1c1e27
Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
5 |
ff3edd1c1e27
Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
6 hg init a |
ff3edd1c1e27
Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
7 cd a |
ff3edd1c1e27
Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
8 |
ff3edd1c1e27
Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
9 echo 'base' > base |
ff3edd1c1e27
Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
10 hg ci -Ambase -d '1 0' |
ff3edd1c1e27
Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
11 |
ff3edd1c1e27
Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
12 hg qnew -mmqbase mqbase |
ff3edd1c1e27
Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
13 |
ff3edd1c1e27
Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
14 hg qsave |
ff3edd1c1e27
Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
15 hg qrestore 2 |