Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge6 @ 2549:e1831f06eef1
Added ability to clone from a local repository to a (new) remote one.
Rearranged the clone command a good bit to make sure it validates that
the source does exist and that the destination doesn't before doing anything.
Before I moved the source repo check it would create the destination
repository before it verified the source existed.
Moved the responsibility for creating the destination repo root directory
entirly into the localrepo class so that local to local cloning doesn't break.
This also simplifies the code a bit since it's no longer being done in both
clone and init.
Changed the names of the 'repo' and 'other' variables to 'dest_repo' and
'src_repo' to maintain my sanity.
Passes 82/83 tests. The only failure is the version number test, which I
suspect is supposed to fail since it comes from a generated file.
| author | Sean Meiners <sean.meiners@linspire.com> |
|---|---|
| date | Fri, 30 Jun 2006 19:24:02 -0700 |
| parents | e506c14382fd |
| children | ad3d5b4367cb |
| rev | line source |
|---|---|
|
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 |
| 616 | 2 |
| 3 cat <<'EOF' > merge | |
| 4 #!/bin/sh | |
| 5 echo merging for `basename $1` | |
| 6 EOF | |
| 7 chmod +x merge | |
|
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
|
8 HGMERGE=./merge; export HGMERGE |
| 616 | 9 |
| 10 mkdir A1 | |
| 11 cd A1 | |
| 12 hg init | |
| 13 echo This is file foo1 > foo | |
| 14 echo This is file bar1 > bar | |
| 15 hg add foo bar | |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
16 hg commit -m "commit text" -d "1000000 0" |
| 616 | 17 |
| 18 cd .. | |
| 19 hg clone A1 B1 | |
| 20 | |
| 21 cd A1 | |
| 22 rm bar | |
| 23 hg remove bar | |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
24 hg commit -m "commit test" -d "1000000 0" |
| 616 | 25 |
| 26 cd ../B1 | |
| 27 echo This is file foo22 > foo | |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
28 hg commit -m "commit test" -d "1000000 0" |
| 616 | 29 |
| 30 cd .. | |
| 31 hg clone A1 A2 | |
| 32 hg clone B1 B2 | |
| 33 | |
| 34 cd A1 | |
| 35 hg pull ../B1 | |
|
2283
e506c14382fd
deprecate 'update -m'. use 'merge' instead.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
36 hg merge |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
37 hg commit -m "commit test" -d "1000000 0" |
| 616 | 38 echo bar should remain deleted. |
| 39 hg manifest | |
| 40 | |
| 41 cd ../B2 | |
| 42 hg pull ../A2 | |
|
2283
e506c14382fd
deprecate 'update -m'. use 'merge' instead.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
43 hg merge |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
44 hg commit -m "commit test" -d "1000000 0" |
| 616 | 45 echo bar should remain deleted. |
| 46 hg manifest |