Greg Ward
d19641671c
test-fetch: fix non-portable sed regex.
...
(s/...\+/.../ appears to be a GNU-ism: this test broke on OS X and
NetBSD. Changing \+ to * fixes it, although that is a slightly less
strict regex.)
2009-07-12 22:33:00 -04:00
Henrik Stuart
a44e9f8977
branch heads: fix regression introduced in 084c96645721 (issue1726)
...
For merge nodes it is not adequate to only check a single possible
branch head for whether it is an ancestor of the latest head, but it
needs to be done for each possible branch head.
2009-07-09 20:49:02 +02:00
Benjamin Pollack
022828a7a5
regression test for issue1552
...
Ensures that fetch correctly infers what to merge when pulling a
repository with inactive branches.
2009-03-17 11:34:40 -04:00
Matt Mackall
eed64a7674
tests: add killdaemons helper script
2008-11-07 16:28:53 -06:00
Sune Foldager
1465c20864
fetch: use dirstate branch instead of first parents
2008-09-24 13:22:11 +02:00
Sune Foldager
71dc05b36f
fetch: added support for named branches
...
Previously, fetch didn't really work when there were multiple named branches
in the repository. Now it tries to do the right thing(tm) in all situations.
2008-09-08 12:55:46 +02:00
Thomas Arendsen Hein
597f358322
adjust test-fetch output to non-default HGPORT, e.g. with run-tests.py -j
2008-03-14 01:39:15 +01:00
Thomas Arendsen Hein
36ad657bd7
test-fetch failed due to non-zero exit code
2008-03-12 09:04:20 +01:00
Bryan O'Sullivan
f9f5e47a2f
fetch: don't proceed if working directory is missing files (issue988)
2008-03-11 11:38:12 -07:00
Bryan O'Sullivan
7ccd4e897d
fetch: make test reproducible, tiny code cleanup
2008-03-05 09:20:57 -08:00
Bryan O'Sullivan
d160458ee9
fetch: switch the default parent used for a merge
...
This treats newly pulled changes as authoritative, and local changes as
the "satellite" changes.
The prior default behaviour is still available, via the --switch-parent
option.
2008-03-05 09:10:45 -08:00
Bryan O'Sullivan
497bf2ca7a
fetch: hide authentication details
2008-01-04 11:58:27 -08:00
Thomas Arendsen Hein
a1f1b33ecb
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc
...
and add documentation for this.
2006-08-22 10:08:42 +02:00
Vadim Gelfer
e946d15d30
test-fetch: make output stable
2006-08-08 16:23:02 -07:00
Vadim Gelfer
9b3aa8dfc1
fetch: fix breakage from mpm.
...
add test so will not break again.
2006-08-08 16:09:26 -07:00
