Mercurial > hg
view tests/test-double-merge @ 7178:98b6c3dde237
Fix Debian bug #494889 (fetching from static-http://... broken)
Changeset 6605a03cbf87 which fixed issue965 (hg clone static-http
does not work for empty repos) broke cloning of repos with old layout
(without store) via static-http.
This fix makes cloning from old-style repositories possible again,
but will not allow cloning of empty old-style repositories as this
can not be detected reliably.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sun, 19 Oct 2008 19:49:56 +0200 |
parents | 99a4592ea886 |
children | 50b6af595e0c |
line wrap: on
line source
#!/bin/sh hg init repo cd repo echo line 1 > foo hg ci -qAm 'add foo' -d "1000000 0" # copy foo to bar and change both files hg cp foo bar echo line 2-1 >> foo echo line 2-2 >> bar hg ci -m 'cp foo bar; change both' -d "1000000 0" # in another branch, change foo in a way that doesn't conflict with # the other changes hg up -qC 0 echo line 0 > foo hg cat foo >> foo hg ci -m 'change foo' -d "1000000 0" # we get conflicts that shouldn't be there hg merge --debug echo "-- foo --" cat foo echo "-- bar --" cat bar