Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-export.out @ 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 | 2b3175acb653 |
children |
rev | line source |
---|---|
3899
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
1 # foo-%nof%N.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
2 exporting patches: |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
3 foo-01of10.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
4 foo-02of10.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
5 foo-03of10.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
6 foo-04of10.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
7 foo-05of10.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
8 foo-06of10.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
9 foo-07of10.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
10 foo-08of10.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
11 foo-09of10.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
12 foo-10of10.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
13 # foo-%%%H.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
14 exporting patches: |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
15 foo-%617188a1c80f869a7b66c85134da88a6fb145f67.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
16 foo-%dd41a5ff707a5225204105611ba49cc5c229d55f.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
17 foo-%f95a5410f8664b6e1490a4af654e4b7d41a7b321.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
18 foo-%4346bcfde53b4d9042489078bcfa9c3e28201db2.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
19 foo-%afda8c3a009cc99449a05ad8aa4655648c4ecd34.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
20 foo-%35284ce2b6b99c9d2ac66268fe99e68e1974e1aa.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
21 foo-%9688c41894e6931305fa7165a37f6568050b4e9b.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
22 foo-%747d3c68f8ec44bb35816bfcd59aeb50b9654c2f.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
23 foo-%5f17a83f5fbd9414006a5e563eab4c8a00729efd.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
24 foo-%f3acbafac161ec68f1598af38f794f28847ca5d3.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
25 # foo-%b-%R.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
26 exporting patches: |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
27 foo-repo-2.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
28 foo-repo-3.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
29 foo-repo-4.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
30 foo-repo-5.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
31 foo-repo-6.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
32 foo-repo-7.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
33 foo-repo-8.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
34 foo-repo-9.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
35 foo-repo-10.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
36 foo-repo-11.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
37 # foo-%h.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
38 exporting patches: |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
39 foo-617188a1c80f.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
40 foo-dd41a5ff707a.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
41 foo-f95a5410f866.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
42 foo-4346bcfde53b.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
43 foo-afda8c3a009c.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
44 foo-35284ce2b6b9.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
45 foo-9688c41894e6.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
46 foo-747d3c68f8ec.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
47 foo-5f17a83f5fbd.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
48 foo-f3acbafac161.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
49 # foo-%r.patch |
504dee0abeac
Make sequence number on hg export start at 1 (as documented for %n). Add test.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
50 exporting patches: |
3900
2b3175acb653
Don't use node length for calculating revision number length.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3899
diff
changeset
|
51 foo-02.patch |
2b3175acb653
Don't use node length for calculating revision number length.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3899
diff
changeset
|
52 foo-03.patch |
2b3175acb653
Don't use node length for calculating revision number length.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3899
diff
changeset
|
53 foo-04.patch |
2b3175acb653
Don't use node length for calculating revision number length.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3899
diff
changeset
|
54 foo-05.patch |
2b3175acb653
Don't use node length for calculating revision number length.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3899
diff
changeset
|
55 foo-06.patch |
2b3175acb653
Don't use node length for calculating revision number length.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3899
diff
changeset
|
56 foo-07.patch |
2b3175acb653
Don't use node length for calculating revision number length.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3899
diff
changeset
|
57 foo-08.patch |
2b3175acb653
Don't use node length for calculating revision number length.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3899
diff
changeset
|
58 foo-09.patch |
2b3175acb653
Don't use node length for calculating revision number length.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3899
diff
changeset
|
59 foo-10.patch |
2b3175acb653
Don't use node length for calculating revision number length.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3899
diff
changeset
|
60 foo-11.patch |