mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 09:17:30 +03:00
9fd7f0d2b4
Summary: Before we assumed that if the rows_affected length doesn't match the number of entries we were trying to insert we have a conflict. Let's verify if we really have conflict or we're trying to insert the same entry twice. Reviewed By: krallin Differential Revision: D20343219 fbshipit-source-id: 19e032439fdd65f5fe1afe1a10b401bc2fe33462
51 lines
1.8 KiB
Perl
51 lines
1.8 KiB
Perl
# Copyright (c) Facebook, Inc. and its affiliates.
|
|
#
|
|
# This software may be used and distributed according to the terms of the
|
|
# GNU General Public License found in the LICENSE file in the root
|
|
# directory of this source tree.
|
|
|
|
$ . "${TEST_FIXTURES}/library.sh"
|
|
|
|
$ hg init repo-hg --config format.usefncache=False
|
|
|
|
$ cd repo-hg
|
|
$ cat >> .hg/hgrc <<EOF
|
|
> [extensions]
|
|
> commitextras=
|
|
> treemanifest=
|
|
> [treemanifest]
|
|
> server=True
|
|
> EOF
|
|
|
|
$ touch file1
|
|
$ hg add
|
|
adding file1
|
|
$ hg commit -m "adding commit with git metadata" --extra convert_revision=37b0a167e07f2b84149c918cec818ffeb183aaaa --extra hg-git-rename-source=git
|
|
|
|
$ touch file2
|
|
$ hg add
|
|
adding file2
|
|
$ hg commit -m "adding commit with git metadata" --extra convert_revision=37b0a167e07f2b84149c918cec818ffeb183bbbb --extra hg-git-rename-source=git
|
|
|
|
$ touch file3
|
|
$ hg add
|
|
adding file3
|
|
$ hg commit -m "no extras, expect to skip writing to bonsai_globalrev_mapping table"
|
|
|
|
$ touch file4
|
|
$ hg add
|
|
adding file4
|
|
$ hg commit -m "adding commit with git metadata" --extra convert_revision=37b0a167e07f2b84149c918cec818ffeb183dddd --extra hg-git-rename-source=git
|
|
|
|
$ POPULATE_GIT_MAPPING=1 setup_mononoke_config
|
|
$ cd $TESTTMP
|
|
$ blobimport repo-hg/.hg repo
|
|
$ blobimport repo-hg/.hg repo
|
|
$ get_bonsai_git_mapping
|
|
F81E4A4F6A773CFBCE1A4204B0A7BCA28EA200224AFDBC8C0FB47B5B42DFF249|37B0A167E07F2B84149C918CEC818FFEB183AAAA
|
|
8B67890898056D938E08AD5025875C07B55EBE53CE8376C1106C5C8A1699D43D|37B0A167E07F2B84149C918CEC818FFEB183BBBB
|
|
F2F8F29ECE7BD30C836C4949A7D2FEF10DEE3BC1B41C1200884C29DB05E0BD88|37B0A167E07F2B84149C918CEC818FFEB183DDDD
|
|
|
|
$ cat "$TESTTMP/blobimport.out" | grep "git mapping"
|
|
*] The git mapping is missing in bonsai commit extras: ChangesetId(Blake2(3a1bb821b2601e9da7300d0d56a88815c915c152fdbbce60fb38e22ecf99c293)) (glob)
|