Nemcio/git-remote-hg
1
0
Fork 0
mirror of https://github.com/mnauw/git-remote-hg.git synced 2025-11-16 16:05:48 +01:00
Code Issues Packages Projects Releases Activity

test: relax hg-git checks

Browse Source 
We don't care about the revision number of the commits, only the
topology.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
This commit is contained in:
Felipe Contreras
2023-03-05 12:28:28 -06:00
parent 6ae5e3961e
commit ec7119d0ef
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
test/hg-git.t
View File

@@ -93,8 +93,9 @@ hg_push_hg () {
} }
hg_log () { hg_log () {
hg -R $1 log --graph --debug | hg -R $1 log --debug -r 'sort(tip:0, date)' |
grep -v 'tag: *default/' grep -v 'tag: *default/' |
sed -e 's/[0-9]\+:\([0-9a-f]\{40\}\)/\1/'
} }
git_log () { git_log () {
@@ -232,16 +233,16 @@ test_expect_success 'merge conflict 1' '
hg ci -m "origin" && hg ci -m "origin" &&
echo B > afile && echo B > afile &&
hg ci -m "A->B" && hg ci -m "A->B" -d "1 0" &&
hg up -r0 && hg up -r0 &&
echo C > afile && echo C > afile &&
hg ci -m "A->C" && hg ci -m "A->C" -d "2 0" &&
hg merge -r1 && hg merge -r1 &&
echo C > afile && echo C > afile &&
hg resolve -m afile && hg resolve -m afile &&
hg ci -m "merge to C" hg ci -m "merge to C" -d "3 0"
) && ) &&
for x in hg git for x in hg git
@@ -267,16 +268,16 @@ test_expect_success 'merge conflict 2' '
hg ci -m "origin" && hg ci -m "origin" &&
echo B > afile && echo B > afile &&
hg ci -m "A->B" && hg ci -m "A->B" -d "1 0" &&
hg up -r0 && hg up -r0 &&
echo C > afile && echo C > afile &&
hg ci -m "A->C" && hg ci -m "A->C" -d "2 0" &&
hg merge -r1 || true && hg merge -r1 || true &&
echo B > afile && echo B > afile &&
hg resolve -m afile && hg resolve -m afile &&
hg ci -m "merge to B" hg ci -m "merge to B" -d "3 0"
) && ) &&
for x in hg git for x in hg git
@@ -302,17 +303,17 @@ test_expect_success 'converged merge' '
hg ci -m "origin" && hg ci -m "origin" &&
echo B > afile && echo B > afile &&
hg ci -m "A->B" && hg ci -m "A->B" -d "1 0" &&
echo C > afile && echo C > afile &&
hg ci -m "B->C" && hg ci -m "B->C" -d "2 0" &&
hg up -r0 && hg up -r0 &&
echo C > afile && echo C > afile &&
hg ci -m "A->C" && hg ci -m "A->C" -d "3 0" &&
hg merge -r2 || true && hg merge -r2 || true &&
hg ci -m "merge" hg ci -m "merge" -d "4 0"
) && ) &&
for x in hg git for x in hg git