Skip to content
Build, Test, and Pack

Drop net461 support in favor of net462 and drop net6.0 #84

Sign in to view logs

Drop net461 support in favor of net462 and drop net6.0

Drop net461 support in favor of net462 and drop net6.0 #84

GitHub Actions / Test Results failed Nov 15, 2024 in 0s

20 fail, 56 skipped, 913 pass in 2h 45m 51s

     10 files  ±0     453 suites  ±0   2h 45m 51s ⏱️ -4s
   989 tests ±0     913 ✔️ +1    56 💤 ±0  20 ❌  - 1 
4 258 runs  ±0  4 013 ✔️ +4  200 💤 ±0  45 ❌  - 4 

Results for commit 18e435f. ± Comparison against earlier commit 7b61f26.

Annotations

Check warning on line 0 in /

See this annotation in the file changed.

@github-actions github-actions / Test Results

All 2 runs failed: Main_NoConflictFileB4_ConflictsEncountered_HaveConflictFileAfter 

artifacts/Test Results (ubuntu-latest)/output/Release/net462/TestResults/ChorusMerge.Tests.xml
artifacts/Test Results (windows-latest)/output/Release/net462/TestResults/ChorusMerge.Tests.xml
Raw output 
  Expected: 0
  But was:  1
  at ChorusMerge.Tests.ChorusMergeTests.Main_NoConflictFileB4_ConflictsEncountered_HaveConflictFileAfter () [0x00018] in <462760a1b1c14333b8ebe9d36144072e>:0
ChorusMerge: /tmp/ChorusTest/bob.lift, /tmp/ChorusTest/ancestor.lift, /tmp/ChorusTest/sally.lift
####heartbeat####
####heartbeat####
####heartbeat####
####heartbeat####
####heartbeat####
ChorusMerge Error: You must create at least one LocalizationManager before trying to localize any strings.
  at L10NSharp.LocalizationManagerInternal`1[T].GetStringFromAnyLocalizationManager (System.String stringId) [0x00013] in <1347b3563c3949cc9cd23b334d253edd>:0 
  at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText, System.String comment, System.String englishToolTipText, System.String englishShortcutKey, System.ComponentModel.IComponent component) [0x00030] in <1347b3563c3949cc9cd23b334d253edd>:0 
  at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText) [0x00000] in <1347b3563c3949cc9cd23b334d253edd>:0 
  at L10NSharp.LocalizationManager.GetString (System.String stringId, System.String englishText) [0x00006] in <1347b3563c3949cc9cd23b334d253edd>:0 
  at Chorus.merge.xml.generic.XmlTextBothEditedTextConflict.get_WhatHappened () [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.merge.xml.generic.ElementConflict.GetFullHumanReadableDescription () [0x00022] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.merge.xml.generic.Conflict.MakeHtmlDetails (System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlMaker) [0x00026] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator, Chorus.merge.xml.generic.XmlMerger merger, System.Xml.XmlNode nodeToFindGeneratorFrom) [0x0002f] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.merge.xml.generic.XmlMerger.ConflictOccurred (Chorus.merge.IConflict conflict) [0x00019] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.merge.xml.generic.MergeTextNodesMethod.Run () [0x0047a] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.merge.xml.generic.XmlMerger.DoTextMerge (System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor, Chorus.merge.xml.generic.ElementStrategy elementStrat) [0x0001f] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x000ac] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.merge.xml.generic.MergeChildrenMethod.Run () [0x003ab] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x00133] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.merge.xml.generic.MergeChildrenMethod.Run () [0x003ab] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x00133] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.merge.xml.generic.MergeChildrenMethod.Run () [0x003ab] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x00133] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.merge.xml.generic.XmlMerger.Merge (Chorus.merge.xml.generic.IMergeEventListener eventListener, System.Xml.XmlNode ourParent, System.Xml.XmlNode ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x0000c] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.FileTypeHandlers.lift.LiftEntryMergingStrategy.MakeMergedEntry (Chorus.merge.xml.generic.IMergeEventListener listener, System.Xml.XmlNode ourEntry, System.Xml.XmlNode theirEntry, System.Xml.XmlNode commonEntry) [0x0000d] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.merge.xml.generic.XmlMergeService.ReportNormalEditConflicts (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Collections.Generic.IDictionary`2[TKey,TValue] allLoserData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpAncestorNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allCommonAncestorData, System.Collections.Generic.IEnumerable`1[T] allIdsWhereUsersMadeDifferentChanges, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpWinnerNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpLoserNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allWinnerData) [0x000af] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.merge.xml.generic.XmlMergeService.CollectDataAndReportNormalEditConflicts (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpLoserNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allCommonAncestorData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpAncestorNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpWinnerNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allLoserData, System.Collections.Generic.IDictionary`2[TKey,TValue] allWinnerData, System.Collections.Generic.IEnumerable`1[T] allWinnerIds, System.Collections.Generic.IEnumerable`1[T] allLoserIds, System.Collections.Generic.HashSet`1[T] allCommonAncestorIds, System.Collections.Generic.HashSet`1[System.String]& allIdsForUniqueLoserChanges, System.Collections.Generic.HashSet`1[System.String]& allIdsWinnerModified) [0x00018] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.merge.xml.generic.XmlMergeService.CollectDataAndReportAllConflicts (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.String winnerId, System.String loserId, System.Collections.Generic.IEnumerable`1[T] allLoserIds, System.Collections.Generic.IDictionary`2[TKey,TValue] allWinnerData, System.Collections.Generic.IEnumerable`1[T] allIdsRemovedByWinner, System.Collections.Generic.IEnumerable`1[T] allIdsRemovedByLoser, System.Collections.Generic.HashSet`1[T] allCommonAncestorIds, System.Collections.Generic.IDictionary`2[TKey,TValue] allCommonAncestorData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpLoserNodes, System.Collections.Generic.IEnumerable`1[T] allWinnerIds, System.Collections.Generic.IDictionary`2[TKey,TValue] allLoserData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpWinnerNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpAncestorNodes, System.String pathToWinner, System.String pathToLoser, System.Collections.Generic.HashSet`1[System.String]& allDeletedByLoserButEditedByWinnerIds, System.Collections.Generic.HashSet`1[System.String]& allDeletedByWinnerButEditedByLoserIds) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.merge.xml.generic.XmlMergeService.DoMerge (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Boolean sortRepeatingRecordOutputByKeyIdentifier, System.String optionalFirstElementMarker, System.String repeatingRecordElementName, System.String repeatingRecordKeyIdentifier, System.String pathToLoser, System.String winnerId, System.String pathToWinner, System.String loserId, System.String commonAncestorPathname) [0x00063] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.merge.xml.generic.XmlMergeService.Do3WayMerge (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Boolean sortRepeatingRecordOutputByKeyIdentifier, System.String optionalFirstElementMarker, System.String repeatingRecordElementName, System.String repeatingRecordKeyIdentifier) [0x0012a] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.FileTypeHandlers.lift.LiftFileHandler.Do3WayMerge (Chorus.merge.MergeOrder mergeOrder) [0x00007] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at ChorusMerge.Program.Main (System.String[] args) [0x00054] in <e143db9c80ed434ebc9f5d8cc73a5224>:0

Check warning on line 0 in /

See this annotation in the file changed.

@github-actions github-actions / Test Results

All 2 runs failed: Main_Utf8FilePaths_FileNamesOk 

artifacts/Test Results (ubuntu-latest)/output/Release/net462/TestResults/ChorusMerge.Tests.xml
artifacts/Test Results (windows-latest)/output/Release/net462/TestResults/ChorusMerge.Tests.xml
Raw output 
  Expected: 0
  But was:  1
  at ChorusMerge.Tests.ChorusMergeTests.Main_Utf8FilePaths_FileNamesOk () [0x000b4] in <462760a1b1c14333b8ebe9d36144072e>:0
ChorusMerge: /tmp/ChorusMergeTest/ไก่ projéct/aaa.chorusTest, /tmp/ChorusMergeTest/aaa.chorusTest, /tmp/ChorusMergeTest/aaa.chorusTest

Check warning on line 0 in /

See this annotation in the file changed.

@github-actions github-actions / Test Results

All 2 runs failed: MakeListItem_InvalidRepositoryProducesDisabledItem 

artifacts/Test Results (ubuntu-latest)/output/Release/net462/TestResults/Chorus.Tests.xml
artifacts/Test Results (windows-latest)/output/Release/net462/TestResults/Chorus.Tests.xml
Raw output 
System.InvalidOperationException : You must create at least one LocalizationManager before trying to localize any strings.
  at L10NSharp.LocalizationManagerInternal`1[T].GetStringFromAnyLocalizationManager (System.String stringId) [0x00013] in <1347b3563c3949cc9cd23b334d253edd>:0 
  at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText, System.String comment, System.String englishToolTipText, System.String englishShortcutKey, System.ComponentModel.IComponent component) [0x00030] in <1347b3563c3949cc9cd23b334d253edd>:0 
  at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText) [0x00000] in <1347b3563c3949cc9cd23b334d253edd>:0 
  at L10NSharp.LocalizationManager.GetString (System.String stringId, System.String englishText) [0x00006] in <1347b3563c3949cc9cd23b334d253edd>:0 
  at Chorus.UI.Clone.CloneFromUsb.get_InvalidRepositoryTemplate () [0x00000] in <e2a42bab70be4a0ea1b3e98dd6d03aa9>:0 
  at Chorus.UI.Clone.CloneFromUsb.CreateListItemFor (System.String path) [0x00050] in <e2a42bab70be4a0ea1b3e98dd6d03aa9>:0 
  at Chorus.Tests.clone.ClonerTests.MakeListItem_InvalidRepositoryProducesDisabledItem () [0x0004e] in <49246d0a3e8f4ba5a214cb8667b41468>:0 
  at (wrapper managed-to-native) System.Reflection.RuntimeMethodInfo.InternalInvoke(System.Reflection.RuntimeMethodInfo,object,object[],System.Exception&)
  at System.Reflection.RuntimeMethodInfo.Invoke (System.Object obj, System.Reflection.BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x0006a] in <d636f104d58046fd9b195699bcb1a744>:0

Check warning on line 0 in /

See this annotation in the file changed.

@github-actions github-actions / Test Results

All 2 runs failed: MakeListItemWhenAlreadyHaveProjectName_MakesDisabledItem 

artifacts/Test Results (ubuntu-latest)/output/Release/net462/TestResults/Chorus.Tests.xml
artifacts/Test Results (windows-latest)/output/Release/net462/TestResults/Chorus.Tests.xml
Raw output 
System.InvalidOperationException : You must create at least one LocalizationManager before trying to localize any strings.
  at L10NSharp.LocalizationManagerInternal`1[T].GetStringFromAnyLocalizationManager (System.String stringId) [0x00013] in <1347b3563c3949cc9cd23b334d253edd>:0 
  at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText, System.String comment, System.String englishToolTipText, System.String englishShortcutKey, System.ComponentModel.IComponent component) [0x00030] in <1347b3563c3949cc9cd23b334d253edd>:0 
  at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText) [0x00000] in <1347b3563c3949cc9cd23b334d253edd>:0 
  at L10NSharp.LocalizationManager.GetString (System.String stringId, System.String englishText) [0x00006] in <1347b3563c3949cc9cd23b334d253edd>:0 
  at Chorus.UI.Clone.CloneFromUsb.get_ProjectWithSameNameExists () [0x00000] in <e2a42bab70be4a0ea1b3e98dd6d03aa9>:0 
  at Chorus.UI.Clone.CloneFromUsb.CreateListItemFor (System.String path) [0x000bb] in <e2a42bab70be4a0ea1b3e98dd6d03aa9>:0 
  at Chorus.Tests.clone.ClonerTests.MakeListItemWhenAlreadyHaveProjectName_MakesDisabledItem () [0x0006b] in <49246d0a3e8f4ba5a214cb8667b41468>:0 
  at (wrapper managed-to-native) System.Reflection.RuntimeMethodInfo.InternalInvoke(System.Reflection.RuntimeMethodInfo,object,object[],System.Exception&)
  at System.Reflection.RuntimeMethodInfo.Invoke (System.Object obj, System.Reflection.BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x0006a] in <d636f104d58046fd9b195699bcb1a744>:0

Check warning on line 0 in /

See this annotation in the file changed.

@github-actions github-actions / Test Results

All 2 runs failed: MakeListItemWhenRepoInUse_MakesDisabledItem 

artifacts/Test Results (ubuntu-latest)/output/Release/net462/TestResults/Chorus.Tests.xml
artifacts/Test Results (windows-latest)/output/Release/net462/TestResults/Chorus.Tests.xml
Raw output 
System.InvalidOperationException : You must create at least one LocalizationManager before trying to localize any strings.
  at L10NSharp.LocalizationManagerInternal`1[T].GetStringFromAnyLocalizationManager (System.String stringId) [0x00013] in <1347b3563c3949cc9cd23b334d253edd>:0 
  at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText, System.String comment, System.String englishToolTipText, System.String englishShortcutKey, System.ComponentModel.IComponent component) [0x00030] in <1347b3563c3949cc9cd23b334d253edd>:0 
  at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText) [0x00000] in <1347b3563c3949cc9cd23b334d253edd>:0 
  at L10NSharp.LocalizationManager.GetString (System.String stringId, System.String englishText) [0x00006] in <1347b3563c3949cc9cd23b334d253edd>:0 
  at Chorus.UI.Clone.CloneFromUsb.get_ProjectInUseTemplate () [0x00000] in <e2a42bab70be4a0ea1b3e98dd6d03aa9>:0 
  at Chorus.UI.Clone.CloneFromUsb.CreateListItemFor (System.String path) [0x00080] in <e2a42bab70be4a0ea1b3e98dd6d03aa9>:0 
  at Chorus.Tests.clone.ClonerTests.MakeListItemWhenRepoInUse_MakesDisabledItem () [0x000a2] in <49246d0a3e8f4ba5a214cb8667b41468>:0 
  at (wrapper managed-to-native) System.Reflection.RuntimeMethodInfo.InternalInvoke(System.Reflection.RuntimeMethodInfo,object,object[],System.Exception&)
  at System.Reflection.RuntimeMethodInfo.Invoke (System.Object obj, System.Reflection.BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x0006a] in <d636f104d58046fd9b195699bcb1a744>:0
    Executing: init "/tmp/ChorusTest-Dan-0eb18d0b-7990-423e-b097-94ed1dd51b8d/test projéct" 
    Started at 2024-11-15 07:04:44Z
    Local User: Dan
    Repository URI: 
    Local Directory: /tmp/ChorusTest-Dan-0eb18d0b-7990-423e-b097-94ed1dd51b8d/test projéct
    
    Executing: recover 
    standerr: no interrupted transaction available
    Executing: addremove -s 100 -I **.wav
    Executing: parents --template "changeset:{rev}:{node|short}
    branch:{branches}
    user:{author}
    date:{date|rfc822date}
    tag:{tags}
    summary:{desc}
    parent:{p1rev}:{p1node}"
    Executing: parents --template "changeset:{rev}:{node|short}
    branch:{branches}
    user:{author}
    date:{date|rfc822date}
    tag:{tags}
    summary:{desc}
    parent:{p1rev}:{p1node}"
    Dan changing working dir to branch: default
    Executing: branch -f "default" 
    standout: marked working directory as branch default
    (branches are permanent and global, did you want a bookmark?)
Storing changes in local repository...
    Executing: status  -mau  
    standout: ? test.1w1
    Executing: status -d 
    Adding files to be tracked ( -I "/tmp/ChorusTest-Dan-0eb18d0b-7990-423e-b097-94ed1dd51b8d/test projéct/*.1w1" -I "/tmp/ChorusTest-Dan-0eb18d0b-7990-423e-b097-94ed1dd51b8d/test projéct/**.ChorusNotes" -I "/tmp/ChorusTest-Dan-0eb18d0b-7990-423e-b097-94ed1dd51b8d/test projéct/**.ChorusRescuedFile" -X "/tmp/ChorusTest-Dan-0eb18d0b-7990-423e-b097-94ed1dd51b8d/test projéct/~~*.txt" -X "/tmp/ChorusTest-Dan-0eb18d0b-7990-423e-b097-94ed1dd51b8d/test projéct/**.NewChorusNotes" -X "/tmp/ChorusTest-Dan-0eb18d0b-7990-423e-b097-94ed1dd51b8d/test projéct/Chorus/ChorusStorage/**.*"
    Executing: add  -I "/tmp/ChorusTest-Dan-0eb18d0b-7990-423e-b097-94ed1dd51b8d/test projéct/*.1w1" -I "/tmp/ChorusTest-Dan-0eb18d0b-7990-423e-b097-94ed1dd51b8d/test projéct/**.ChorusNotes" -I "/tmp/ChorusTest-Dan-0eb18d0b-7990-423e-b097-94ed1dd51b8d/test projéct/**.ChorusRescuedFile" -X "/tmp/ChorusTest-Dan-0eb18d0b-7990-423e-b097-94ed1dd51b8d/test projéct/~~*.txt" -X "/tmp/ChorusTest-Dan-0eb18d0b-7990-423e-b097-94ed1dd51b8d/test projéct/**.NewChorusNotes" -X "/tmp/ChorusTest-Dan-0eb18d0b-7990-423e-b097-94ed1dd51b8d/test projéct/Chorus/ChorusStorage/**.*" 
    standout: adding test.1w1
    Committing "missing checkin description"
    Dan committing with comment: missing checkin description
    Executing: ci -u "Dan" -m "missing checkin description" 
    
    
    Executing: status --change tip
    standout: A test.1w1
    Executing: parents --template "changeset:{rev}:{node|short}
    branch:{branches}
    user:{author}
    date:{date|rfc822date}
    tag:{tags}
    summary:{desc}
    parent:{p1rev}:{p1node}"
    standout: changeset:0:37514f58c646
    branch:
    user:Dan
    date:Fri, 15 Nov 2024 07:04:46 +0000
    tag:tip
    summary:missing checkin description
    parent:-1:0000000000000000000000000000000000000000
    Executing and caching: log -r0 --template "{node}" 
    standout: 37514f58c6467954d5f36d4080ea381b780316b7
    Using cached result: log -r0 --template "{node}" 
    standout: 37514f58c6467954d5f36d4080ea381b780316b7
    Using cached result: log -r0 --template "{node}" 
    standout: 37514f58c6467954d5f36d4080ea381b780316b7
    Executing: log -r-1 --template "{node}" 
    standout: 37514f58c6467954d5f36d4080ea381b780316b7
    Executing: parents --template "changeset:{rev}:{node|short}
    branch:{branches}
    user:{author}
    date:{date|rfc822date}
    tag:{tags}
    summary:{desc}
    parent:{p1rev}:{p1node}"
    standout: changeset:0:37514f58c646
    branch:
    user:Dan
    date:Fri, 15 Nov 2024 07:04:46 +0000
    tag:tip
    summary:missing checkin description
    parent:-1:0000000000000000000000000000000000000000
    Using cached result: log -r0 --template "{node}" 
    standout: 37514f58c6467954d5f36d4080ea381b780316b7
    Using cached result: log -r0 --template "{node}" 
    standout: 37514f58c6467954d5f36d4080ea381b780316b7
    Using cached result: log -r0 --template "{node}" 
    standout: 37514f58c6467954d5f36d4080ea381b780316b7
    Executing: log -r-1 --template "{node}" 
    standout: 37514f58c6467954d5f36d4080ea381b780316b7
    Executing: parents --template "changeset:{rev}:{node|short}
    branch:{branches}
    user:{author}
    date:{date|rfc822date}
    tag:{tags}
    summary:{desc}
    parent:{p1rev}:{p1node}"
    standout: changeset:0:37514f58c646
    branch:
    user:Dan
    date:Fri, 15 Nov 2024 07:04:46 +0000
    tag:tip
    summary:missing checkin description
    parent:-1:0000000000000000000000000000000000000000
    Using cached result: log -r0 --template "{node}" 
    standout: 37514f58c6467954d5f36d4080ea381b780316b7
    Using cached result: log -r0 --template "{node}" 
    standout: 37514f58c6467954d5f36d4080ea381b780316b7
    Using cached result: log -r0 --template "{node}" 
    standout: 37514f58c6467954d5f36d4080ea381b780316b7
    Executing: log -r-1 --template "{node}" 
    standout: 37514f58c6467954d5f36d4080ea381b780316b7
    Getting heads of Dan
    Executing: heads --template "changeset:{rev}:{node|short}
    branch:{branches}
    user:{author}
    date:{date|rfc822date}
    tag:{tags}
    summary:{desc}
    "
    standout: changeset:0:37514f58c646
    branch:
    user:Dan
    date:Fri, 15 Nov 2024 07:04:46 +0000
    tag:tip
    summary:missing checkin description
    Using cached result: log -r0 --template "{node}" 
    standout: 37514f58c6467954d5f36d4080ea381b780316b7
    Using cached result: log -r0 --template "{node}" 
    standout: 37514f58c6467954d5f36d4080ea381b780316b7
Done
    Finished at 2024-11-15 07:04:48Z
    Executing and caching: log -r0 --template "{node}" 
    standout: 37514f58c6467954d5f36d4080ea381b780316b7

Check warning on line 0 in /

See this annotation in the file changed.

@github-actions github-actions / Test Results

All 2 runs failed: FilterStateMessage_HideAll_HideNone 

artifacts/Test Results (ubuntu-latest)/output/Release/net462/TestResults/Chorus.Tests.xml
artifacts/Test Results (windows-latest)/output/Release/net462/TestResults/Chorus.Tests.xml
Raw output 
System.InvalidOperationException : You must create at least one LocalizationManager before trying to localize any strings.
  at L10NSharp.LocalizationManagerInternal`1[T].GetStringFromAnyLocalizationManager (System.String stringId) [0x00013] in <1347b3563c3949cc9cd23b334d253edd>:0 
  at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText, System.String comment, System.String englishToolTipText, System.String englishShortcutKey, System.ComponentModel.IComponent component) [0x00030] in <1347b3563c3949cc9cd23b334d253edd>:0 
  at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText, System.String comment) [0x00000] in <1347b3563c3949cc9cd23b334d253edd>:0 
  at L10NSharp.LocalizationManager.GetString (System.String stringId, System.String englishText, System.String comment) [0x00006] in <1347b3563c3949cc9cd23b334d253edd>:0 
  at Chorus.UI.Notes.Browser.NotesInProjectViewModel.get_FilterStateMessage () [0x000bd] in <e2a42bab70be4a0ea1b3e98dd6d03aa9>:0 
  at Chorus.Tests.notes.NotesInProjectModelTests.FilterStateMessage_HideAll_HideNone () [0x00057] in <49246d0a3e8f4ba5a214cb8667b41468>:0 
  at (wrapper managed-to-native) System.Reflection.RuntimeMethodInfo.InternalInvoke(System.Reflection.RuntimeMethodInfo,object,object[],System.Exception&)
  at System.Reflection.RuntimeMethodInfo.Invoke (System.Object obj, System.Reflection.BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x0006a] in <d636f104d58046fd9b195699bcb1a744>:0

Check warning on line 0 in /

See this annotation in the file changed.

@github-actions github-actions / Test Results

All 2 runs failed: Sync_GetUsbStatusLink_NoUsb 

artifacts/Test Results (ubuntu-latest)/output/Release/net462/TestResults/Chorus.Tests.xml
artifacts/Test Results (windows-latest)/output/Release/net462/TestResults/Chorus.Tests.xml
Raw output 
System.InvalidOperationException : You must create at least one LocalizationManager before trying to localize any strings.
  at L10NSharp.LocalizationManagerInternal`1[T].GetStringFromAnyLocalizationManager (System.String stringId) [0x00013] in <1347b3563c3949cc9cd23b334d253edd>:0 
  at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText, System.String comment, System.String englishToolTipText, System.String englishShortcutKey, System.ComponentModel.IComponent component) [0x00030] in <1347b3563c3949cc9cd23b334d253edd>:0 
  at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText) [0x00000] in <1347b3563c3949cc9cd23b334d253edd>:0 
  at L10NSharp.LocalizationManager.GetString (System.String stringId, System.String englishText) [0x00006] in <1347b3563c3949cc9cd23b334d253edd>:0 
  at Chorus.UI.Sync.SyncStartModel.GetUsbStatusLink (Chorus.UI.IUsbDriveLocator usbDriveLocator, System.String& message) [0x00016] in <e2a42bab70be4a0ea1b3e98dd6d03aa9>:0 
  at Chorus.Tests.UI.Sync.SyncDialogTests.Sync_GetUsbStatusLink_NoUsb () [0x00013] in <49246d0a3e8f4ba5a214cb8667b41468>:0 
  at (wrapper managed-to-native) System.Reflection.RuntimeMethodInfo.InternalInvoke(System.Reflection.RuntimeMethodInfo,object,object[],System.Exception&)
  at System.Reflection.RuntimeMethodInfo.Invoke (System.Object obj, System.Reflection.BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x0006a] in <d636f104d58046fd9b195699bcb1a744>:0

Check warning on line 0 in /

See this annotation in the file changed.

@github-actions github-actions / Test Results

1 out of 2 runs failed: CanShowNotesBrowserPage 

artifacts/Test Results (windows-latest)/output/Release/net462/TestResults/Chorus.Tests.xml
Raw output 
Autofac.Core.DependencyResolutionException : An exception was thrown while activating Chorus.UI.Notes.Browser.NotesBrowserPage -> Chorus.UI.Notes.AnnotationEditorView.
Data:
  ActivatorChain: Chorus.UI.Notes.Browser.NotesBrowserPage -> Chorus.UI.Notes.AnnotationEditorView
  ----> Autofac.Core.DependencyResolutionException : An exception was thrown while invoking the constructor 'Void .ctor(Chorus.UI.Notes.AnnotationEditorModel)' on type 'AnnotationEditorView'.
  ----> System.InvalidOperationException : You must create at least one LocalizationManager before trying to localize any strings.
   at Autofac.Core.Resolving.InstanceLookup.Activate(IEnumerable`1 parameters, Object& decoratorTarget)
   at Autofac.Core.Lifetime.LifetimeScope.GetOrCreateAndShare(Guid id, Func`1 creator)
   at Autofac.Core.Resolving.InstanceLookup.Execute()
   at Autofac.Core.Resolving.ResolveOperation.GetOrCreateInstance(ISharingLifetimeScope currentOperationScope, IComponentRegistration registration, IEnumerable`1 parameters)
   at Autofac.Core.Resolving.ResolveOperation.Execute(IComponentRegistration registration, IEnumerable`1 parameters)
   at Autofac.ResolutionExtensions.TryResolveService(IComponentContext context, Service service, IEnumerable`1 parameters, Object& instance)
   at Autofac.ResolutionExtensions.ResolveService(IComponentContext context, Service service, IEnumerable`1 parameters)
   at lambda_method(Closure , IEnumerable`1 )
   at Chorus.Tests.ChorusSystemTests.CanShowNotesBrowserPage() in D:\a\chorus\chorus\src\Chorus.Tests\ChorusSystemTests.cs:line 62
--DependencyResolutionException
   at Autofac.Core.Activators.Reflection.ConstructorParameterBinding.Instantiate()
   at Autofac.Core.Activators.Reflection.ReflectionActivator.ActivateInstance(IComponentContext context, IEnumerable`1 parameters)
   at Autofac.Core.Resolving.InstanceLookup.Activate(IEnumerable`1 parameters, Object& decoratorTarget)
--InvalidOperationException
   at L10NSharp.LocalizationManagerInternal`1.GetStringFromAnyLocalizationManager(String stringId)
   at L10NSharp.LocalizationManagerInternal`1.GetString(String stringId, String englishText, String comment, String englishToolTipText, String englishShortcutKey, IComponent component)
   at Chorus.UI.Notes.AnnotationEditorModel.GetOKButtonText(Boolean closeButtonVisible) in D:\a\chorus\chorus\src\Chorus\UI\Notes\AnnotationEditorModel.cs:line 210
   at Chorus.UI.Notes.AnnotationEditorView._closeButton_VisibleChanged(Object sender, EventArgs e) in D:\a\chorus\chorus\src\Chorus\UI\Notes\AnnotationEditorView.cs:line 136
   at System.Windows.Forms.Control.OnVisibleChanged(EventArgs e)
   at System.Windows.Forms.ButtonBase.OnVisibleChanged(EventArgs e)
   at System.Windows.Forms.Control.SetVisibleCore(Boolean value)
   at Chorus.UI.Notes.AnnotationEditorView..ctor(AnnotationEditorModel model) in D:\a\chorus\chorus\src\Chorus\UI\Notes\AnnotationEditorView.cs:line 23
   at lambda_method(Closure , Object[] )
   at Autofac.Core.Activators.Reflection.ConstructorParameterBinding.Instantiate()

Check warning on line 0 in /

See this annotation in the file changed.

@github-actions github-actions / Test Results

1 out of 2 runs failed: GetNotesBarAndBrowser_MakeNewAnnotationWithBar_BrowserSeesIt 

artifacts/Test Results (windows-latest)/output/Release/net462/TestResults/Chorus.Tests.xml
Raw output 
Autofac.Core.DependencyResolutionException : An exception was thrown while activating Chorus.UI.Notes.Browser.NotesBrowserPage -> Chorus.UI.Notes.AnnotationEditorView.
Data:
  ActivatorChain: Chorus.UI.Notes.Browser.NotesBrowserPage -> Chorus.UI.Notes.AnnotationEditorView
  ----> Autofac.Core.DependencyResolutionException : An exception was thrown while invoking the constructor 'Void .ctor(Chorus.UI.Notes.AnnotationEditorModel)' on type 'AnnotationEditorView'.
  ----> System.InvalidOperationException : You must create at least one LocalizationManager before trying to localize any strings.
   at Autofac.Core.Resolving.InstanceLookup.Activate(IEnumerable`1 parameters, Object& decoratorTarget)
   at Autofac.Core.Lifetime.LifetimeScope.GetOrCreateAndShare(Guid id, Func`1 creator)
   at Autofac.Core.Resolving.InstanceLookup.Execute()
   at Autofac.Core.Resolving.ResolveOperation.GetOrCreateInstance(ISharingLifetimeScope currentOperationScope, IComponentRegistration registration, IEnumerable`1 parameters)
   at Autofac.Core.Resolving.ResolveOperation.Execute(IComponentRegistration registration, IEnumerable`1 parameters)
   at Autofac.ResolutionExtensions.TryResolveService(IComponentContext context, Service service, IEnumerable`1 parameters, Object& instance)
   at Autofac.ResolutionExtensions.ResolveService(IComponentContext context, Service service, IEnumerable`1 parameters)
   at lambda_method(Closure , IEnumerable`1 )
   at Chorus.Tests.ChorusSystemTests.GetNotesBarAndBrowser_MakeNewAnnotationWithBar_BrowserSeesIt() in D:\a\chorus\chorus\src\Chorus.Tests\ChorusSystemTests.cs:line 154
--DependencyResolutionException
   at Autofac.Core.Activators.Reflection.ConstructorParameterBinding.Instantiate()
   at Autofac.Core.Activators.Reflection.ReflectionActivator.ActivateInstance(IComponentContext context, IEnumerable`1 parameters)
   at Autofac.Core.Resolving.InstanceLookup.Activate(IEnumerable`1 parameters, Object& decoratorTarget)
--InvalidOperationException
   at L10NSharp.LocalizationManagerInternal`1.GetStringFromAnyLocalizationManager(String stringId)
   at L10NSharp.LocalizationManagerInternal`1.GetString(String stringId, String englishText, String comment, String englishToolTipText, String englishShortcutKey, IComponent component)
   at Chorus.UI.Notes.AnnotationEditorModel.GetOKButtonText(Boolean closeButtonVisible) in D:\a\chorus\chorus\src\Chorus\UI\Notes\AnnotationEditorModel.cs:line 210
   at Chorus.UI.Notes.AnnotationEditorView._closeButton_VisibleChanged(Object sender, EventArgs e) in D:\a\chorus\chorus\src\Chorus\UI\Notes\AnnotationEditorView.cs:line 136
   at System.Windows.Forms.Control.OnVisibleChanged(EventArgs e)
   at System.Windows.Forms.ButtonBase.OnVisibleChanged(EventArgs e)
   at System.Windows.Forms.Control.SetVisibleCore(Boolean value)
   at Chorus.UI.Notes.AnnotationEditorView..ctor(AnnotationEditorModel model) in D:\a\chorus\chorus\src\Chorus\UI\Notes\AnnotationEditorView.cs:line 23
   at lambda_method(Closure , Object[] )
   at Autofac.Core.Activators.Reflection.ConstructorParameterBinding.Instantiate()

Check warning on line 0 in /

See this annotation in the file changed.

@github-actions github-actions / Test Results

1 out of 2 runs failed: CreateNotesBrowser 

artifacts/Test Results (windows-latest)/output/Release/net462/TestResults/Chorus.Tests.xml
Raw output 
Autofac.Core.DependencyResolutionException : An exception was thrown while activating Chorus.UI.Notes.Browser.NotesBrowserPage -> Chorus.UI.Notes.AnnotationEditorView.
Data:
  ActivatorChain: Chorus.UI.Notes.Browser.NotesBrowserPage -> Chorus.UI.Notes.AnnotationEditorView
  ----> Autofac.Core.DependencyResolutionException : An exception was thrown while invoking the constructor 'Void .ctor(Chorus.UI.Notes.AnnotationEditorModel)' on type 'AnnotationEditorView'.
  ----> System.InvalidOperationException : You must create at least one LocalizationManager before trying to localize any strings.
   at Autofac.Core.Resolving.InstanceLookup.Activate(IEnumerable`1 parameters, Object& decoratorTarget)
   at Autofac.Core.Lifetime.LifetimeScope.GetOrCreateAndShare(Guid id, Func`1 creator)
   at Autofac.Core.Resolving.InstanceLookup.Execute()
   at Autofac.Core.Resolving.ResolveOperation.GetOrCreateInstance(ISharingLifetimeScope currentOperationScope, IComponentRegistration registration, IEnumerable`1 parameters)
   at Autofac.Core.Resolving.ResolveOperation.Execute(IComponentRegistration registration, IEnumerable`1 parameters)
   at Autofac.ResolutionExtensions.TryResolveService(IComponentContext context, Service service, IEnumerable`1 parameters, Object& instance)
   at Autofac.ResolutionExtensions.ResolveService(IComponentContext context, Service service, IEnumerable`1 parameters)
   at lambda_method(Closure , IEnumerable`1 )
--DependencyResolutionException
   at Autofac.Core.Activators.Reflection.ConstructorParameterBinding.Instantiate()
   at Autofac.Core.Activators.Reflection.ReflectionActivator.ActivateInstance(IComponentContext context, IEnumerable`1 parameters)
   at Autofac.Core.Resolving.InstanceLookup.Activate(IEnumerable`1 parameters, Object& decoratorTarget)
--InvalidOperationException
   at L10NSharp.LocalizationManagerInternal`1.GetStringFromAnyLocalizationManager(String stringId)
   at L10NSharp.LocalizationManagerInternal`1.GetString(String stringId, String englishText, String comment, String englishToolTipText, String englishShortcutKey, IComponent component)
   at Chorus.UI.Notes.AnnotationEditorModel.GetOKButtonText(Boolean closeButtonVisible) in D:\a\chorus\chorus\src\Chorus\UI\Notes\AnnotationEditorModel.cs:line 210
   at Chorus.UI.Notes.AnnotationEditorView._closeButton_VisibleChanged(Object sender, EventArgs e) in D:\a\chorus\chorus\src\Chorus\UI\Notes\AnnotationEditorView.cs:line 136
   at System.Windows.Forms.Control.OnVisibleChanged(EventArgs e)
   at System.Windows.Forms.ButtonBase.OnVisibleChanged(EventArgs e)
   at System.Windows.Forms.Control.SetVisibleCore(Boolean value)
   at Chorus.UI.Notes.AnnotationEditorView..ctor(AnnotationEditorModel model) in D:\a\chorus\chorus\src\Chorus\UI\Notes\AnnotationEditorView.cs:line 23
   at lambda_method(Closure , Object[] )
   at Autofac.Core.Activators.Reflection.ConstructorParameterBinding.Instantiate()

Check warning on line 0 in /

See this annotation in the file changed.

@github-actions github-actions / Test Results

All 4 runs failed: ConflictFileIsCheckedIn 

artifacts/Test Results (ubuntu-latest)/output/Release/net462/TestResults/LibChorus.Tests.xml
artifacts/Test Results (ubuntu-latest)/output/Release/net8.0/TestResults/LibChorus.Tests.xml
artifacts/Test Results (windows-latest)/output/Release/net462/TestResults/LibChorus.Tests.xml
artifacts/Test Results (windows-latest)/output/Release/net8.0/TestResults/LibChorus.Tests.xml
Raw output 
  Conflict file should have been in working set
  Expected: file or directory exists
  But was:  "/tmp/ChorusTest-sally-30d55d8b-5c82-4a97-bccc-6dc5f4c1c898/foo project/test.lift.ChorusNotes"
  at LibChorus.Tests.sync.ChorusNotesFileSyncTests.ConflictFileIsCheckedIn () [0x00067] in <319370d7f1fb494fa3976b76fe610d9a>:0
TestRepository Created: /tmp/ChorusTest-bob-a461547b-de96-41e5-8a60-e35800fa3bf4
Storing changes in local repository...
Done
TestRepository Cloned: /tmp/ChorusTest-sally-30d55d8b-5c82-4a97-bccc-6dc5f4c1c898
Trying to Create repository clone at /tmp/ChorusTest-sally-30d55d8b-5c82-4a97-bccc-6dc5f4c1c898/foo project
  Creating new repository at /tmp/ChorusTest-sally-30d55d8b-5c82-4a97-bccc-6dc5f4c1c898/foo project
Storing changes in local repository...
Done
Storing changes in local repository...
Connecting to bob...
Receiving any changes from bob
Merging sally and bob...
Error: ChorusMerge Error: You must create at least one LocalizationManager before trying to localize any strings.
at L10NSharp.LocalizationManagerInternal`1[T].GetStringFromAnyLocalizationManager (System.String stringId) [0x00013] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText, System.String comment, System.String englishToolTipText, System.String englishShortcutKey, System.ComponentModel.IComponent component) [0x00030] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText) [0x00000] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManager.GetString (System.String stringId, System.String englishText) [0x00006] in <1347b3563c3949cc9cd23b334d253edd>:0
at Chorus.merge.xml.generic.XmlTextBothEditedTextConflict.get_WhatHappened () [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.ElementConflict.GetFullHumanReadableDescription () [0x00022] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.Conflict.MakeHtmlDetails (System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlMaker) [0x00026] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator, Chorus.merge.xml.generic.XmlMerger merger, System.Xml.XmlNode nodeToFindGeneratorFrom) [0x0002f] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.ConflictOccurred (Chorus.merge.IConflict conflict) [0x00019] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.MergeTextNodesMethod.Run () [0x0047a] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.DoTextMerge (System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor, Chorus.merge.xml.generic.ElementStrategy elementStrat) [0x0001f] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x000ac] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.MergeChildrenMethod.Run () [0x003ab] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x00133] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.MergeChildrenMethod.Run () [0x003ab] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x00133] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.MergeChildrenMethod.Run () [0x003ab] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x00133] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.Merge (Chorus.merge.xml.generic.IMergeEventListener eventListener, System.Xml.XmlNode ourParent, System.Xml.XmlNode ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x0000c] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.FileTypeHandlers.lift.LiftEntryMergingStrategy.MakeMergedEntry (Chorus.merge.xml.generic.IMergeEventListener listener, System.Xml.XmlNode ourEntry, System.Xml.XmlNode theirEntry, System.Xml.XmlNode commonEntry) [0x0000d] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.ReportNormalEditConflicts (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Collections.Generic.IDictionary`2[TKey,TValue] allLoserData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpAncestorNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allCommonAncestorData, System.Collections.Generic.IEnumerable`1[T] allIdsWhereUsersMadeDifferentChanges, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpWinnerNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpLoserNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allWinnerData) [0x000af] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.CollectDataAndReportNormalEditConflicts (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpLoserNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allCommonAncestorData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpAncestorNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpWinnerNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allLoserData, System.Collections.Generic.IDictionary`2[TKey,TValue] allWinnerData, System.Collections.Generic.IEnumerable`1[T] allWinnerIds, System.Collections.Generic.IEnumerable`1[T] allLoserIds, System.Collections.Generic.HashSet`1[T] allCommonAncestorIds, System.Collections.Generic.HashSet`1[System.String]& allIdsForUniqueLoserChanges, System.Collections.Generic.HashSet`1[System.String]& allIdsWinnerModified) [0x00018] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.CollectDataAndReportAllConflicts (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.String winnerId, System.String loserId, System.Collections.Generic.IEnumerable`1[T] allLoserIds, System.Collections.Generic.IDictionary`2[TKey,TValue] allWinnerData, System.Collections.Generic.IEnumerable`1[T] allIdsRemovedByWinner, System.Collections.Generic.IEnumerable`1[T] allIdsRemovedByLoser, System.Collections.Generic.HashSet`1[T] allCommonAncestorIds, System.Collections.Generic.IDictionary`2[TKey,TValue] allCommonAncestorData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpLoserNodes, System.Collections.Generic.IEnumerable`1[T] allWinnerIds, System.Collections.Generic.IDictionary`2[TKey,TValue] allLoserData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpWinnerNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpAncestorNodes, System.String pathToWinner, System.String pathToLoser, System.Collections.Generic.HashSet`1[System.String]& allDeletedByLoserButEditedByWinnerIds, System.Collections.Generic.HashSet`1[System.String]& allDeletedByWinnerButEditedByLoserIds) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.DoMerge (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Boolean sortRepeatingRecordOutputByKeyIdentifier, System.String optionalFirstElementMarker, System.String repeatingRecordElementName, System.String repeatingRecordKeyIdentifier, System.String pathToLoser, System.String winnerId, System.String pathToWinner, System.String loserId, System.String commonAncestorPathname) [0x00063] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.Do3WayMerge (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Boolean sortRepeatingRecordOutputByKeyIdentifier, System.String optionalFirstElementMarker, System.String repeatingRecordElementName, System.String repeatingRecordKeyIdentifier) [0x0012a] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.FileTypeHandlers.lift.LiftFileHandler.Do3WayMerge (Chorus.merge.MergeOrder mergeOrder) [0x00007] in <78c3b836c1b14be181b16a096f6abac0>:0
at ChorusMerge.Program.Main (System.String[] args) [0x00054] in <e143db9c80ed434ebc9f5d8cc73a5224>:0
merging test.lift failed!

Error: Also had this in the standard output:
Error: merging test.lift
Running ChorusMerge.exe...
ChorusMerge: /tmp/ChorusTest-sally-30d55d8b-5c82-4a97-bccc-6dc5f4c1c898/foo project/test.lift, /tmp/hgmerge-dr5_hh5z/test~base.lift, /tmp/hgmerge-dr5_hh5z/test~other.lift
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon

Error: Exception: 
Error: Unable to complete the send/receive.
Error:   at Chorus.sync.Synchronizer.ExplainAndThrow (System.Exception exception, Chorus.sync.Synchronizer+WhatToDo whatToDo, System.String explanation, System.Object[] args) [0x00014] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.sync.Synchronizer.MergeHeads () [0x000ea] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.sync.Synchronizer.MergeHeadsOrRollbackAndThrow (Chorus.VcsDrivers.Mercurial.HgRepository repo, Chorus.VcsDrivers.Mercurial.Revision workingRevBeforeSync) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0 
  Error: Inner: 
  Error: Exception: 
  Error: ChorusMerge Error: You must create at least one LocalizationManager before trying to localize any strings.
at L10NSharp.LocalizationManagerInternal`1[T].GetStringFromAnyLocalizationManager (System.String stringId) [0x00013] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText, System.String comment, System.String englishToolTipText, System.String englishShortcutKey, System.ComponentModel.IComponent component) [0x00030] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText) [0x00000] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManager.GetString (System.String stringId, System.String englishText) [0x00006] in <1347b3563c3949cc9cd23b334d253edd>:0
at Chorus.merge.xml.generic.XmlTextBothEditedTextConflict.get_WhatHappened () [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.ElementConflict.GetFullHumanReadableDescription () [0x00022] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.Conflict.MakeHtmlDetails (System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlMaker) [0x00026] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator, Chorus.merge.xml.generic.XmlMerger merger, System.Xml.XmlNode nodeToFindGeneratorFrom) [0x0002f] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.ConflictOccurred (Chorus.merge.IConflict conflict) [0x00019] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.MergeTextNodesMethod.Run () [0x0047a] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.DoTextMerge (System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor, Chorus.merge.xml.generic.ElementStrategy elementStrat) [0x0001f] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x000ac] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.MergeChildrenMethod.Run () [0x003ab] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x00133] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.MergeChildrenMethod.Run () [0x003ab] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x00133] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.MergeChildrenMethod.Run () [0x003ab] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x00133] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.Merge (Chorus.merge.xml.generic.IMergeEventListener eventListener, System.Xml.XmlNode ourParent, System.Xml.XmlNode ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x0000c] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.FileTypeHandlers.lift.LiftEntryMergingStrategy.MakeMergedEntry (Chorus.merge.xml.generic.IMergeEventListener listener, System.Xml.XmlNode ourEntry, System.Xml.XmlNode theirEntry, System.Xml.XmlNode commonEntry) [0x0000d] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.ReportNormalEditConflicts (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Collections.Generic.IDictionary`2[TKey,TValue] allLoserData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpAncestorNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allCommonAncestorData, System.Collections.Generic.IEnumerable`1[T] allIdsWhereUsersMadeDifferentChanges, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpWinnerNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpLoserNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allWinnerData) [0x000af] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.CollectDataAndReportNormalEditConflicts (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpLoserNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allCommonAncestorData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpAncestorNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpWinnerNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allLoserData, System.Collections.Generic.IDictionary`2[TKey,TValue] allWinnerData, System.Collections.Generic.IEnumerable`1[T] allWinnerIds, System.Collections.Generic.IEnumerable`1[T] allLoserIds, System.Collections.Generic.HashSet`1[T] allCommonAncestorIds, System.Collections.Generic.HashSet`1[System.String]& allIdsForUniqueLoserChanges, System.Collections.Generic.HashSet`1[System.String]& allIdsWinnerModified) [0x00018] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.CollectDataAndReportAllConflicts (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.String winnerId, System.String loserId, System.Collections.Generic.IEnumerable`1[T] allLoserIds, System.Collections.Generic.IDictionary`2[TKey,TValue] allWinnerData, System.Collections.Generic.IEnumerable`1[T] allIdsRemovedByWinner, System.Collections.Generic.IEnumerable`1[T] allIdsRemovedByLoser, System.Collections.Generic.HashSet`1[T] allCommonAncestorIds, System.Collections.Generic.IDictionary`2[TKey,TValue] allCommonAncestorData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpLoserNodes, System.Collections.Generic.IEnumerable`1[T] allWinnerIds, System.Collections.Generic.IDictionary`2[TKey,TValue] allLoserData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpWinnerNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpAncestorNodes, System.String pathToWinner, System.String pathToLoser, System.Collections.Generic.HashSet`1[System.String]& allDeletedByLoserButEditedByWinnerIds, System.Collections.Generic.HashSet`1[System.String]& allDeletedByWinnerButEditedByLoserIds) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.DoMerge (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Boolean sortRepeatingRecordOutputByKeyIdentifier, System.String optionalFirstElementMarker, System.String repeatingRecordElementName, System.String repeatingRecordKeyIdentifier, System.String pathToLoser, System.String winnerId, System.String pathToWinner, System.String loserId, System.String commonAncestorPathname) [0x00063] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.Do3WayMerge (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Boolean sortRepeatingRecordOutputByKeyIdentifier, System.String optionalFirstElementMarker, System.String repeatingRecordElementName, System.String repeatingRecordKeyIdentifier) [0x0012a] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.FileTypeHandlers.lift.LiftFileHandler.Do3WayMerge (Chorus.merge.MergeOrder mergeOrder) [0x00007] in <78c3b836c1b14be181b16a096f6abac0>:0
at ChorusMerge.Program.Main (System.String[] args) [0x00054] in <e143db9c80ed434ebc9f5d8cc73a5224>:0
merging test.lift failed!

  Error:   at Chorus.VcsDrivers.Mercurial.HgRepository.Merge (System.String localRepositoryPath, System.String revisionNumber) [0x000de] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.sync.Synchronizer.MergeTwoChangeSets (Chorus.VcsDrivers.Mercurial.Revision head, Chorus.VcsDrivers.Mercurial.Revision theirHead) [0x00031] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.sync.Synchronizer.MergeHeads () [0x00097] in <78c3b836c1b14be181b16a096f6abac0>:0 
Error: Rolling back...
Error: Unable to complete the send/receive.
Error: Unable to complete the send/receive.
Error: You may need expert help.
notesFile '/tmp/ChorusTest-sally-30d55d8b-5c82-4a97-bccc-6dc5f4c1c898/foo project/test.lift.ChorusNotes'
TestRepository deleted /tmp/ChorusTest-sally-30d55d8b-5c82-4a97-bccc-6dc5f4c1c898
TestRepository deleted /tmp/ChorusTest-bob-a461547b-de96-41e5-8a60-e35800fa3bf4

Check warning on line 0 in /

See this annotation in the file changed.

@github-actions github-actions / Test Results

All 4 runs failed: BothMadeChanges_MergeFailure_Fires_SimpleUpdate_WithTrue 

artifacts/Test Results (ubuntu-latest)/output/Release/net462/TestResults/LibChorus.Tests.xml
artifacts/Test Results (ubuntu-latest)/output/Release/net8.0/TestResults/LibChorus.Tests.xml
artifacts/Test Results (windows-latest)/output/Release/net462/TestResults/LibChorus.Tests.xml
artifacts/Test Results (windows-latest)/output/Release/net8.0/TestResults/LibChorus.Tests.xml
Raw output 
System.ApplicationException : FailureSimulator was not tiggered: SychronizerAdjunct
  at Chorus.Utilities.FailureSimulator.Dispose () [0x00031] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at LibChorus.Tests.sync.SychronizerAdjunctTests.BothMadeChanges_MergeFailure_Fires_SimpleUpdate_WithTrue () [0x000dc] in <319370d7f1fb494fa3976b76fe610d9a>:0 
  at (wrapper managed-to-native) System.Reflection.RuntimeMethodInfo.InternalInvoke(System.Reflection.RuntimeMethodInfo,object,object[],System.Exception&)
  at System.Reflection.RuntimeMethodInfo.Invoke (System.Object obj, System.Reflection.BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x0006a] in <d636f104d58046fd9b195699bcb1a744>:0
TestRepository Created: /tmp/ChorusTest-bob-e3b82d97-fe66-46e8-a986-c251ca57947f
Storing changes in local repository...
Done
TestRepository Cloned: /tmp/ChorusTest-sally-7bf73537-3461-41c8-ab98-6f55481be840
Trying to Create repository clone at /tmp/ChorusTest-sally-7bf73537-3461-41c8-ab98-6f55481be840/foo project
  Creating new repository at /tmp/ChorusTest-sally-7bf73537-3461-41c8-ab98-6f55481be840/foo project
Storing changes in local repository...
Done
Storing changes in local repository...
Connecting to bob...
Receiving any changes from bob
Merging sally and bob...
Error: ChorusMerge Error: You must create at least one LocalizationManager before trying to localize any strings.
at L10NSharp.LocalizationManagerInternal`1[T].GetStringFromAnyLocalizationManager (System.String stringId) [0x00013] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText, System.String comment, System.String englishToolTipText, System.String englishShortcutKey, System.ComponentModel.IComponent component) [0x00030] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText) [0x00000] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManager.GetString (System.String stringId, System.String englishText) [0x00006] in <1347b3563c3949cc9cd23b334d253edd>:0
at Chorus.merge.xml.generic.XmlTextBothEditedTextConflict.get_WhatHappened () [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.ElementConflict.GetFullHumanReadableDescription () [0x00022] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.Conflict.MakeHtmlDetails (System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlMaker) [0x00026] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator, Chorus.merge.xml.generic.XmlMerger merger, System.Xml.XmlNode nodeToFindGeneratorFrom) [0x0002f] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.ConflictOccurred (Chorus.merge.IConflict conflict) [0x00019] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.MergeTextNodesMethod.Run () [0x0047a] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.DoTextMerge (System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor, Chorus.merge.xml.generic.ElementStrategy elementStrat) [0x0001f] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x000ac] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.MergeChildrenMethod.Run () [0x003ab] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x00133] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.MergeChildrenMethod.Run () [0x003ab] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x00133] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.MergeChildrenMethod.Run () [0x003ab] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x00133] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.Merge (Chorus.merge.xml.generic.IMergeEventListener eventListener, System.Xml.XmlNode ourParent, System.Xml.XmlNode ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x0000c] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.FileTypeHandlers.lift.LiftEntryMergingStrategy.MakeMergedEntry (Chorus.merge.xml.generic.IMergeEventListener listener, System.Xml.XmlNode ourEntry, System.Xml.XmlNode theirEntry, System.Xml.XmlNode commonEntry) [0x0000d] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.ReportNormalEditConflicts (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Collections.Generic.IDictionary`2[TKey,TValue] allLoserData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpAncestorNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allCommonAncestorData, System.Collections.Generic.IEnumerable`1[T] allIdsWhereUsersMadeDifferentChanges, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpWinnerNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpLoserNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allWinnerData) [0x000af] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.CollectDataAndReportNormalEditConflicts (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpLoserNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allCommonAncestorData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpAncestorNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpWinnerNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allLoserData, System.Collections.Generic.IDictionary`2[TKey,TValue] allWinnerData, System.Collections.Generic.IEnumerable`1[T] allWinnerIds, System.Collections.Generic.IEnumerable`1[T] allLoserIds, System.Collections.Generic.HashSet`1[T] allCommonAncestorIds, System.Collections.Generic.HashSet`1[System.String]& allIdsForUniqueLoserChanges, System.Collections.Generic.HashSet`1[System.String]& allIdsWinnerModified) [0x00018] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.CollectDataAndReportAllConflicts (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.String winnerId, System.String loserId, System.Collections.Generic.IEnumerable`1[T] allLoserIds, System.Collections.Generic.IDictionary`2[TKey,TValue] allWinnerData, System.Collections.Generic.IEnumerable`1[T] allIdsRemovedByWinner, System.Collections.Generic.IEnumerable`1[T] allIdsRemovedByLoser, System.Collections.Generic.HashSet`1[T] allCommonAncestorIds, System.Collections.Generic.IDictionary`2[TKey,TValue] allCommonAncestorData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpLoserNodes, System.Collections.Generic.IEnumerable`1[T] allWinnerIds, System.Collections.Generic.IDictionary`2[TKey,TValue] allLoserData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpWinnerNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpAncestorNodes, System.String pathToWinner, System.String pathToLoser, System.Collections.Generic.HashSet`1[System.String]& allDeletedByLoserButEditedByWinnerIds, System.Collections.Generic.HashSet`1[System.String]& allDeletedByWinnerButEditedByLoserIds) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.DoMerge (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Boolean sortRepeatingRecordOutputByKeyIdentifier, System.String optionalFirstElementMarker, System.String repeatingRecordElementName, System.String repeatingRecordKeyIdentifier, System.String pathToLoser, System.String winnerId, System.String pathToWinner, System.String loserId, System.String commonAncestorPathname) [0x00063] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.Do3WayMerge (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Boolean sortRepeatingRecordOutputByKeyIdentifier, System.String optionalFirstElementMarker, System.String repeatingRecordElementName, System.String repeatingRecordKeyIdentifier) [0x0012a] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.FileTypeHandlers.lift.LiftFileHandler.Do3WayMerge (Chorus.merge.MergeOrder mergeOrder) [0x00007] in <78c3b836c1b14be181b16a096f6abac0>:0
at ChorusMerge.Program.Main (System.String[] args) [0x00054] in <e143db9c80ed434ebc9f5d8cc73a5224>:0
merging test.lift failed!

Error: Also had this in the standard output:
Error: merging test.lift
Running ChorusMerge.exe...
ChorusMerge: /tmp/ChorusTest-sally-7bf73537-3461-41c8-ab98-6f55481be840/foo project/test.lift, /tmp/hgmerge-kp0pcsk5/test~base.lift, /tmp/hgmerge-kp0pcsk5/test~other.lift
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon

Error: Exception: 
Error: Unable to complete the send/receive.
Error:   at Chorus.sync.Synchronizer.ExplainAndThrow (System.Exception exception, Chorus.sync.Synchronizer+WhatToDo whatToDo, System.String explanation, System.Object[] args) [0x00014] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.sync.Synchronizer.MergeHeads () [0x000ea] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.sync.Synchronizer.MergeHeadsOrRollbackAndThrow (Chorus.VcsDrivers.Mercurial.HgRepository repo, Chorus.VcsDrivers.Mercurial.Revision workingRevBeforeSync) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0 
  Error: Inner: 
  Error: Exception: 
  Error: ChorusMerge Error: You must create at least one LocalizationManager before trying to localize any strings.
at L10NSharp.LocalizationManagerInternal`1[T].GetStringFromAnyLocalizationManager (System.String stringId) [0x00013] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText, System.String comment, System.String englishToolTipText, System.String englishShortcutKey, System.ComponentModel.IComponent component) [0x00030] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText) [0x00000] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManager.GetString (System.String stringId, System.String englishText) [0x00006] in <1347b3563c3949cc9cd23b334d253edd>:0
at Chorus.merge.xml.generic.XmlTextBothEditedTextConflict.get_WhatHappened () [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.ElementConflict.GetFullHumanReadableDescription () [0x00022] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.Conflict.MakeHtmlDetails (System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlMaker) [0x00026] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator, Chorus.merge.xml.generic.XmlMerger merger, System.Xml.XmlNode nodeToFindGeneratorFrom) [0x0002f] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.ConflictOccurred (Chorus.merge.IConflict conflict) [0x00019] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.MergeTextNodesMethod.Run () [0x0047a] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.DoTextMerge (System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor, Chorus.merge.xml.generic.ElementStrategy elementStrat) [0x0001f] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x000ac] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.MergeChildrenMethod.Run () [0x003ab] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x00133] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.MergeChildrenMethod.Run () [0x003ab] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x00133] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.MergeChildrenMethod.Run () [0x003ab] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x00133] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.Merge (Chorus.merge.xml.generic.IMergeEventListener eventListener, System.Xml.XmlNode ourParent, System.Xml.XmlNode ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x0000c] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.FileTypeHandlers.lift.LiftEntryMergingStrategy.MakeMergedEntry (Chorus.merge.xml.generic.IMergeEventListener listener, System.Xml.XmlNode ourEntry, System.Xml.XmlNode theirEntry, System.Xml.XmlNode commonEntry) [0x0000d] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.ReportNormalEditConflicts (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Collections.Generic.IDictionary`2[TKey,TValue] allLoserData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpAncestorNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allCommonAncestorData, System.Collections.Generic.IEnumerable`1[T] allIdsWhereUsersMadeDifferentChanges, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpWinnerNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpLoserNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allWinnerData) [0x000af] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.CollectDataAndReportNormalEditConflicts (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpLoserNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allCommonAncestorData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpAncestorNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpWinnerNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allLoserData, System.Collections.Generic.IDictionary`2[TKey,TValue] allWinnerData, System.Collections.Generic.IEnumerable`1[T] allWinnerIds, System.Collections.Generic.IEnumerable`1[T] allLoserIds, System.Collections.Generic.HashSet`1[T] allCommonAncestorIds, System.Collections.Generic.HashSet`1[System.String]& allIdsForUniqueLoserChanges, System.Collections.Generic.HashSet`1[System.String]& allIdsWinnerModified) [0x00018] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.CollectDataAndReportAllConflicts (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.String winnerId, System.String loserId, System.Collections.Generic.IEnumerable`1[T] allLoserIds, System.Collections.Generic.IDictionary`2[TKey,TValue] allWinnerData, System.Collections.Generic.IEnumerable`1[T] allIdsRemovedByWinner, System.Collections.Generic.IEnumerable`1[T] allIdsRemovedByLoser, System.Collections.Generic.HashSet`1[T] allCommonAncestorIds, System.Collections.Generic.IDictionary`2[TKey,TValue] allCommonAncestorData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpLoserNodes, System.Collections.Generic.IEnumerable`1[T] allWinnerIds, System.Collections.Generic.IDictionary`2[TKey,TValue] allLoserData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpWinnerNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpAncestorNodes, System.String pathToWinner, System.String pathToLoser, System.Collections.Generic.HashSet`1[System.String]& allDeletedByLoserButEditedByWinnerIds, System.Collections.Generic.HashSet`1[System.String]& allDeletedByWinnerButEditedByLoserIds) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.DoMerge (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Boolean sortRepeatingRecordOutputByKeyIdentifier, System.String optionalFirstElementMarker, System.String repeatingRecordElementName, System.String repeatingRecordKeyIdentifier, System.String pathToLoser, System.String winnerId, System.String pathToWinner, System.String loserId, System.String commonAncestorPathname) [0x00063] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.Do3WayMerge (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Boolean sortRepeatingRecordOutputByKeyIdentifier, System.String optionalFirstElementMarker, System.String repeatingRecordElementName, System.String repeatingRecordKeyIdentifier) [0x0012a] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.FileTypeHandlers.lift.LiftFileHandler.Do3WayMerge (Chorus.merge.MergeOrder mergeOrder) [0x00007] in <78c3b836c1b14be181b16a096f6abac0>:0
at ChorusMerge.Program.Main (System.String[] args) [0x00054] in <e143db9c80ed434ebc9f5d8cc73a5224>:0
merging test.lift failed!

  Error:   at Chorus.VcsDrivers.Mercurial.HgRepository.Merge (System.String localRepositoryPath, System.String revisionNumber) [0x000de] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.sync.Synchronizer.MergeTwoChangeSets (Chorus.VcsDrivers.Mercurial.Revision head, Chorus.VcsDrivers.Mercurial.Revision theirHead) [0x00031] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.sync.Synchronizer.MergeHeads () [0x00097] in <78c3b836c1b14be181b16a096f6abac0>:0 
Error: Rolling back...
Error: Unable to complete the send/receive.
Error: Unable to complete the send/receive.
Error: You may need expert help.
TestRepository deleted /tmp/ChorusTest-sally-7bf73537-3461-41c8-ab98-6f55481be840
TestRepository deleted /tmp/ChorusTest-bob-e3b82d97-fe66-46e8-a986-c251ca57947f

Check warning on line 0 in /

See this annotation in the file changed.

@github-actions github-actions / Test Results

All 4 runs failed: CommitWithMergeHasCommitFileAndMergeFile 

artifacts/Test Results (ubuntu-latest)/output/Release/net462/TestResults/LibChorus.Tests.xml
artifacts/Test Results (ubuntu-latest)/output/Release/net8.0/TestResults/LibChorus.Tests.xml
artifacts/Test Results (windows-latest)/output/Release/net462/TestResults/LibChorus.Tests.xml
artifacts/Test Results (windows-latest)/output/Release/net8.0/TestResults/LibChorus.Tests.xml
Raw output 
  PullFile should exist.
  Expected: file or directory exists
  But was:  "/tmp/ChorusTest-sally-fe1ba772-1442-4c3f-bba7-37d99e47326c/Pull.txt"
  at LibChorus.Tests.sync.SychronizerAdjunctTests.CheckExistanceOfAdjunctFiles (LibChorus.Tests.sync.SychronizerAdjunctTests+FileWriterSychronizerAdjunct syncAdjunct, System.Boolean commitFileShouldExist, System.Boolean pullFileShouldExist, System.Boolean rollbackFileShouldExist, System.Boolean mergeFileShouldExist, System.Boolean branchNameFileShouldExist, System.Boolean branchesFileShouldExist) [0x00056] in <319370d7f1fb494fa3976b76fe610d9a>:0 
  at LibChorus.Tests.sync.SychronizerAdjunctTests.CommitWithMergeHasCommitFileAndMergeFile () [0x0009e] in <319370d7f1fb494fa3976b76fe610d9a>:0
TestRepository Created: /tmp/ChorusTest-bob-e8ff4110-51e1-4592-a922-b094bffcbb7a
Storing changes in local repository...
Done
TestRepository Cloned: /tmp/ChorusTest-sally-fe1ba772-1442-4c3f-bba7-37d99e47326c
Trying to Create repository clone at /tmp/ChorusTest-sally-fe1ba772-1442-4c3f-bba7-37d99e47326c/foo project
  Creating new repository at /tmp/ChorusTest-sally-fe1ba772-1442-4c3f-bba7-37d99e47326c/foo project
Storing changes in local repository...
Done
Storing changes in local repository...
Connecting to bob...
Receiving any changes from bob
Merging sally and bob...
Error: ChorusMerge Error: You must create at least one LocalizationManager before trying to localize any strings.
at L10NSharp.LocalizationManagerInternal`1[T].GetStringFromAnyLocalizationManager (System.String stringId) [0x00013] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText, System.String comment, System.String englishToolTipText, System.String englishShortcutKey, System.ComponentModel.IComponent component) [0x00030] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText) [0x00000] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManager.GetString (System.String stringId, System.String englishText) [0x00006] in <1347b3563c3949cc9cd23b334d253edd>:0
at Chorus.merge.xml.generic.XmlTextBothEditedTextConflict.get_WhatHappened () [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.ElementConflict.GetFullHumanReadableDescription () [0x00022] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.Conflict.MakeHtmlDetails (System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlMaker) [0x00026] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator, Chorus.merge.xml.generic.XmlMerger merger, System.Xml.XmlNode nodeToFindGeneratorFrom) [0x0002f] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.ConflictOccurred (Chorus.merge.IConflict conflict) [0x00019] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.MergeTextNodesMethod.Run () [0x0047a] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.DoTextMerge (System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor, Chorus.merge.xml.generic.ElementStrategy elementStrat) [0x0001f] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x000ac] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.MergeChildrenMethod.Run () [0x003ab] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x00133] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.MergeChildrenMethod.Run () [0x003ab] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x00133] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.MergeChildrenMethod.Run () [0x003ab] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x00133] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.Merge (Chorus.merge.xml.generic.IMergeEventListener eventListener, System.Xml.XmlNode ourParent, System.Xml.XmlNode ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x0000c] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.FileTypeHandlers.lift.LiftEntryMergingStrategy.MakeMergedEntry (Chorus.merge.xml.generic.IMergeEventListener listener, System.Xml.XmlNode ourEntry, System.Xml.XmlNode theirEntry, System.Xml.XmlNode commonEntry) [0x0000d] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.ReportNormalEditConflicts (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Collections.Generic.IDictionary`2[TKey,TValue] allLoserData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpAncestorNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allCommonAncestorData, System.Collections.Generic.IEnumerable`1[T] allIdsWhereUsersMadeDifferentChanges, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpWinnerNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpLoserNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allWinnerData) [0x000af] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.CollectDataAndReportNormalEditConflicts (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpLoserNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allCommonAncestorData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpAncestorNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpWinnerNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allLoserData, System.Collections.Generic.IDictionary`2[TKey,TValue] allWinnerData, System.Collections.Generic.IEnumerable`1[T] allWinnerIds, System.Collections.Generic.IEnumerable`1[T] allLoserIds, System.Collections.Generic.HashSet`1[T] allCommonAncestorIds, System.Collections.Generic.HashSet`1[System.String]& allIdsForUniqueLoserChanges, System.Collections.Generic.HashSet`1[System.String]& allIdsWinnerModified) [0x00018] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.CollectDataAndReportAllConflicts (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.String winnerId, System.String loserId, System.Collections.Generic.IEnumerable`1[T] allLoserIds, System.Collections.Generic.IDictionary`2[TKey,TValue] allWinnerData, System.Collections.Generic.IEnumerable`1[T] allIdsRemovedByWinner, System.Collections.Generic.IEnumerable`1[T] allIdsRemovedByLoser, System.Collections.Generic.HashSet`1[T] allCommonAncestorIds, System.Collections.Generic.IDictionary`2[TKey,TValue] allCommonAncestorData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpLoserNodes, System.Collections.Generic.IEnumerable`1[T] allWinnerIds, System.Collections.Generic.IDictionary`2[TKey,TValue] allLoserData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpWinnerNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpAncestorNodes, System.String pathToWinner, System.String pathToLoser, System.Collections.Generic.HashSet`1[System.String]& allDeletedByLoserButEditedByWinnerIds, System.Collections.Generic.HashSet`1[System.String]& allDeletedByWinnerButEditedByLoserIds) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.DoMerge (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Boolean sortRepeatingRecordOutputByKeyIdentifier, System.String optionalFirstElementMarker, System.String repeatingRecordElementName, System.String repeatingRecordKeyIdentifier, System.String pathToLoser, System.String winnerId, System.String pathToWinner, System.String loserId, System.String commonAncestorPathname) [0x00063] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.Do3WayMerge (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Boolean sortRepeatingRecordOutputByKeyIdentifier, System.String optionalFirstElementMarker, System.String repeatingRecordElementName, System.String repeatingRecordKeyIdentifier) [0x0012a] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.FileTypeHandlers.lift.LiftFileHandler.Do3WayMerge (Chorus.merge.MergeOrder mergeOrder) [0x00007] in <78c3b836c1b14be181b16a096f6abac0>:0
at ChorusMerge.Program.Main (System.String[] args) [0x00054] in <e143db9c80ed434ebc9f5d8cc73a5224>:0
merging test.lift failed!

Error: Also had this in the standard output:
Error: merging test.lift
Running ChorusMerge.exe...
ChorusMerge: /tmp/ChorusTest-sally-fe1ba772-1442-4c3f-bba7-37d99e47326c/foo project/test.lift, /tmp/hgmerge-jwm75ms0/test~base.lift, /tmp/hgmerge-jwm75ms0/test~other.lift
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon

Error: Exception: 
Error: Unable to complete the send/receive.
Error:   at Chorus.sync.Synchronizer.ExplainAndThrow (System.Exception exception, Chorus.sync.Synchronizer+WhatToDo whatToDo, System.String explanation, System.Object[] args) [0x00014] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.sync.Synchronizer.MergeHeads () [0x000ea] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.sync.Synchronizer.MergeHeadsOrRollbackAndThrow (Chorus.VcsDrivers.Mercurial.HgRepository repo, Chorus.VcsDrivers.Mercurial.Revision workingRevBeforeSync) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0 
  Error: Inner: 
  Error: Exception: 
  Error: ChorusMerge Error: You must create at least one LocalizationManager before trying to localize any strings.
at L10NSharp.LocalizationManagerInternal`1[T].GetStringFromAnyLocalizationManager (System.String stringId) [0x00013] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText, System.String comment, System.String englishToolTipText, System.String englishShortcutKey, System.ComponentModel.IComponent component) [0x00030] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText) [0x00000] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManager.GetString (System.String stringId, System.String englishText) [0x00006] in <1347b3563c3949cc9cd23b334d253edd>:0
at Chorus.merge.xml.generic.XmlTextBothEditedTextConflict.get_WhatHappened () [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.ElementConflict.GetFullHumanReadableDescription () [0x00022] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.Conflict.MakeHtmlDetails (System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlMaker) [0x00026] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator, Chorus.merge.xml.generic.XmlMerger merger, System.Xml.XmlNode nodeToFindGeneratorFrom) [0x0002f] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.ConflictOccurred (Chorus.merge.IConflict conflict) [0x00019] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.MergeTextNodesMethod.Run () [0x0047a] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.DoTextMerge (System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor, Chorus.merge.xml.generic.ElementStrategy elementStrat) [0x0001f] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x000ac] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.MergeChildrenMethod.Run () [0x003ab] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x00133] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.MergeChildrenMethod.Run () [0x003ab] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x00133] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.MergeChildrenMethod.Run () [0x003ab] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.MergeInner (System.Xml.XmlNode ourParent, System.Xml.XmlNode& ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x00133] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMerger.Merge (Chorus.merge.xml.generic.IMergeEventListener eventListener, System.Xml.XmlNode ourParent, System.Xml.XmlNode ours, System.Xml.XmlNode theirs, System.Xml.XmlNode ancestor) [0x0000c] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.FileTypeHandlers.lift.LiftEntryMergingStrategy.MakeMergedEntry (Chorus.merge.xml.generic.IMergeEventListener listener, System.Xml.XmlNode ourEntry, System.Xml.XmlNode theirEntry, System.Xml.XmlNode commonEntry) [0x0000d] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.ReportNormalEditConflicts (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Collections.Generic.IDictionary`2[TKey,TValue] allLoserData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpAncestorNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allCommonAncestorData, System.Collections.Generic.IEnumerable`1[T] allIdsWhereUsersMadeDifferentChanges, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpWinnerNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpLoserNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allWinnerData) [0x000af] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.CollectDataAndReportNormalEditConflicts (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpLoserNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allCommonAncestorData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpAncestorNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpWinnerNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] allLoserData, System.Collections.Generic.IDictionary`2[TKey,TValue] allWinnerData, System.Collections.Generic.IEnumerable`1[T] allWinnerIds, System.Collections.Generic.IEnumerable`1[T] allLoserIds, System.Collections.Generic.HashSet`1[T] allCommonAncestorIds, System.Collections.Generic.HashSet`1[System.String]& allIdsForUniqueLoserChanges, System.Collections.Generic.HashSet`1[System.String]& allIdsWinnerModified) [0x00018] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.CollectDataAndReportAllConflicts (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.String winnerId, System.String loserId, System.Collections.Generic.IEnumerable`1[T] allLoserIds, System.Collections.Generic.IDictionary`2[TKey,TValue] allWinnerData, System.Collections.Generic.IEnumerable`1[T] allIdsRemovedByWinner, System.Collections.Generic.IEnumerable`1[T] allIdsRemovedByLoser, System.Collections.Generic.HashSet`1[T] allCommonAncestorIds, System.Collections.Generic.IDictionary`2[TKey,TValue] allCommonAncestorData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpLoserNodes, System.Collections.Generic.IEnumerable`1[T] allWinnerIds, System.Collections.Generic.IDictionary`2[TKey,TValue] allLoserData, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpWinnerNodes, System.Collections.Generic.IDictionary`2[TKey,TValue] fluffedUpAncestorNodes, System.String pathToWinner, System.String pathToLoser, System.Collections.Generic.HashSet`1[System.String]& allDeletedByLoserButEditedByWinnerIds, System.Collections.Generic.HashSet`1[System.String]& allDeletedByWinnerButEditedByLoserIds) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.DoMerge (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Boolean sortRepeatingRecordOutputByKeyIdentifier, System.String optionalFirstElementMarker, System.String repeatingRecordElementName, System.String repeatingRecordKeyIdentifier, System.String pathToLoser, System.String winnerId, System.String pathToWinner, System.String loserId, System.String commonAncestorPathname) [0x00063] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.Do3WayMerge (Chorus.merge.MergeOrder mergeOrder, Chorus.merge.xml.generic.IMergeStrategy mergeStrategy, System.Boolean sortRepeatingRecordOutputByKeyIdentifier, System.String optionalFirstElementMarker, System.String repeatingRecordElementName, System.String repeatingRecordKeyIdentifier) [0x0012a] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.FileTypeHandlers.lift.LiftFileHandler.Do3WayMerge (Chorus.merge.MergeOrder mergeOrder) [0x00007] in <78c3b836c1b14be181b16a096f6abac0>:0
at ChorusMerge.Program.Main (System.String[] args) [0x00054] in <e143db9c80ed434ebc9f5d8cc73a5224>:0
merging test.lift failed!

  Error:   at Chorus.VcsDrivers.Mercurial.HgRepository.Merge (System.String localRepositoryPath, System.String revisionNumber) [0x000de] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.sync.Synchronizer.MergeTwoChangeSets (Chorus.VcsDrivers.Mercurial.Revision head, Chorus.VcsDrivers.Mercurial.Revision theirHead) [0x00031] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.sync.Synchronizer.MergeHeads () [0x00097] in <78c3b836c1b14be181b16a096f6abac0>:0 
Error: Rolling back...
Error: Unable to complete the send/receive.
Error: Unable to complete the send/receive.
Error: You may need expert help.
TestRepository deleted /tmp/ChorusTest-sally-fe1ba772-1442-4c3f-bba7-37d99e47326c
TestRepository deleted /tmp/ChorusTest-bob-e8ff4110-51e1-4592-a922-b094bffcbb7a

Check warning on line 0 in /

See this annotation in the file changed.

@github-actions github-actions / Test Results

All 4 runs failed: Sync_BothChangedBinaryFile_FailureReportedOneChosenSingleHead 

artifacts/Test Results (ubuntu-latest)/output/Release/net462/TestResults/LibChorus.Tests.xml
artifacts/Test Results (ubuntu-latest)/output/Release/net8.0/TestResults/LibChorus.Tests.xml
artifacts/Test Results (windows-latest)/output/Release/net462/TestResults/LibChorus.Tests.xml
artifacts/Test Results (windows-latest)/output/Release/net8.0/TestResults/LibChorus.Tests.xml
Raw output 
  There should be on only one head, but there are 2
  Expected: 1
  But was:  2
  at LibChorus.TestUtilities.RepositoryWithFilesSetup.AssertSingleHead () [0x00038] in <29dc16831e374902b9fee81b01069753>:0 
  at LibChorus.Tests.sync.SynchronizerBadSituationTests.Sync_BothChangedBinaryFile_FailureReportedOneChosenSingleHead () [0x00045] in <319370d7f1fb494fa3976b76fe610d9a>:0
TestRepository Created: /tmp/ChorusTest-bob-30f1b77e-bf6d-4216-b79e-c25d6d5b02a6
Storing changes in local repository...
Done
TestRepository Cloned: /tmp/ChorusTest-sally-23e03ffe-bf5d-4418-99e8-4023f95248a0
Trying to Create repository clone at /tmp/ChorusTest-sally-23e03ffe-bf5d-4418-99e8-4023f95248a0/foo project
  Creating new repository at /tmp/ChorusTest-sally-23e03ffe-bf5d-4418-99e8-4023f95248a0/foo project
Storing changes in local repository...
Done
Storing changes in local repository...
Connecting to bob...
Receiving any changes from bob
Merging sally and bob...
Error: ChorusMerge Error: You must create at least one LocalizationManager before trying to localize any strings.
at L10NSharp.LocalizationManagerInternal`1[T].GetStringFromAnyLocalizationManager (System.String stringId) [0x00013] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText, System.String comment, System.String englishToolTipText, System.String englishShortcutKey, System.ComponentModel.IComponent component) [0x00030] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText, System.String comment) [0x00000] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManager.GetString (System.String stringId, System.String englishText, System.String comment) [0x00006] in <1347b3563c3949cc9cd23b334d253edd>:0
at Chorus.merge.xml.generic.Conflict.get_KeptChangePattern () [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.Conflict.AppendWhatHappened (System.Text.StringBuilder sb) [0x00029] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.Conflict.MakeHtmlDetails (System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlMaker) [0x00081] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator, Chorus.merge.xml.generic.XmlMerger merger, System.Xml.XmlNode nodeToFindGeneratorFrom) [0x0002f] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext) [0x0000b] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.FileTypeHandlers.DefaultFileTypeHandler.Do3WayMerge (Chorus.merge.MergeOrder mergeOrder) [0x0001c] in <78c3b836c1b14be181b16a096f6abac0>:0
at ChorusMerge.Program.Main (System.String[] args) [0x00054] in <e143db9c80ed434ebc9f5d8cc73a5224>:0
merging test.a9a failed!

Error: Also had this in the standard output:
Error: merging test.a9a
Running ChorusMerge.exe...
ChorusMerge: /tmp/ChorusTest-sally-23e03ffe-bf5d-4418-99e8-4023f95248a0/foo project/test.a9a, /tmp/hgmerge-m2lwgzzc/test~base.a9a, /tmp/hgmerge-m2lwgzzc/test~other.a9a
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon

Error: Exception: 
Error: Unable to complete the send/receive.
Error:   at Chorus.sync.Synchronizer.ExplainAndThrow (System.Exception exception, Chorus.sync.Synchronizer+WhatToDo whatToDo, System.String explanation, System.Object[] args) [0x00014] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.sync.Synchronizer.MergeHeads () [0x000ea] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.sync.Synchronizer.MergeHeadsOrRollbackAndThrow (Chorus.VcsDrivers.Mercurial.HgRepository repo, Chorus.VcsDrivers.Mercurial.Revision workingRevBeforeSync) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0 
  Error: Inner: 
  Error: Exception: 
  Error: ChorusMerge Error: You must create at least one LocalizationManager before trying to localize any strings.
at L10NSharp.LocalizationManagerInternal`1[T].GetStringFromAnyLocalizationManager (System.String stringId) [0x00013] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText, System.String comment, System.String englishToolTipText, System.String englishShortcutKey, System.ComponentModel.IComponent component) [0x00030] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText, System.String comment) [0x00000] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManager.GetString (System.String stringId, System.String englishText, System.String comment) [0x00006] in <1347b3563c3949cc9cd23b334d253edd>:0
at Chorus.merge.xml.generic.Conflict.get_KeptChangePattern () [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.Conflict.AppendWhatHappened (System.Text.StringBuilder sb) [0x00029] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.Conflict.MakeHtmlDetails (System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlMaker) [0x00081] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator, Chorus.merge.xml.generic.XmlMerger merger, System.Xml.XmlNode nodeToFindGeneratorFrom) [0x0002f] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext) [0x0000b] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.FileTypeHandlers.DefaultFileTypeHandler.Do3WayMerge (Chorus.merge.MergeOrder mergeOrder) [0x0001c] in <78c3b836c1b14be181b16a096f6abac0>:0
at ChorusMerge.Program.Main (System.String[] args) [0x00054] in <e143db9c80ed434ebc9f5d8cc73a5224>:0
merging test.a9a failed!

  Error:   at Chorus.VcsDrivers.Mercurial.HgRepository.Merge (System.String localRepositoryPath, System.String revisionNumber) [0x000de] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.sync.Synchronizer.MergeTwoChangeSets (Chorus.VcsDrivers.Mercurial.Revision head, Chorus.VcsDrivers.Mercurial.Revision theirHead) [0x00031] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.sync.Synchronizer.MergeHeads () [0x00097] in <78c3b836c1b14be181b16a096f6abac0>:0 
Error: Rolling back...
Error: Unable to complete the send/receive.
Error: Unable to complete the send/receive.
Error: You may need expert help.
TestRepository deleted /tmp/ChorusTest-sally-23e03ffe-bf5d-4418-99e8-4023f95248a0
TestRepository deleted /tmp/ChorusTest-bob-30f1b77e-bf6d-4216-b79e-c25d6d5b02a6

Check warning on line 0 in /

See this annotation in the file changed.

@github-actions github-actions / Test Results

All 4 runs failed: Sync_MergeWhenThereIsMoreThanOneHeadToMergeWith_MergesBoth 

artifacts/Test Results (ubuntu-latest)/output/Release/net462/TestResults/LibChorus.Tests.xml
artifacts/Test Results (ubuntu-latest)/output/Release/net8.0/TestResults/LibChorus.Tests.xml
artifacts/Test Results (windows-latest)/output/Release/net462/TestResults/LibChorus.Tests.xml
artifacts/Test Results (windows-latest)/output/Release/net8.0/TestResults/LibChorus.Tests.xml
Raw output 
  Expected: not String containing "error", ignoring case
  But was:  "Creating new repository at /tmp/ChorusTest-sally-ac176603-25c6-42d3-ad5a-742ed14f0f47/foo project
Storing changes in local repository...
Done
Storing changes in local repository...
Done
Storing changes in local repository...
Done
Storing changes in local repository...
Done
Storing changes in local repository...
Connecting to bob...
Receiving any changes from bob
Merging sally and bob...
Error:ChorusMerge Error: You must create at least one LocalizationManager before trying to localize any strings.
at L10NSharp.LocalizationManagerInternal`1[T].GetStringFromAnyLocalizationManager (System.String stringId) [0x00013] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText, System.String comment, System.String englishToolTipText, System.String englishShortcutKey, System.ComponentModel.IComponent component) [0x00030] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText, System.String comment) [0x00000] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManager.GetString (System.String stringId, System.String englishText, System.String comment) [0x00006] in <1347b3563c3949cc9cd23b334d253edd>:0
at Chorus.merge.xml.generic.Conflict.get_KeptChangePattern () [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.Conflict.AppendWhatHappened (System.Text.StringBuilder sb) [0x00029] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.Conflict.MakeHtmlDetails (System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlMaker) [0x00081] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator, Chorus.merge.xml.generic.XmlMerger merger, System.Xml.XmlNode nodeToFindGeneratorFrom) [0x0002f] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext) [0x0000b] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.FileTypeHandlers.DefaultFileTypeHandler.Do3WayMerge (Chorus.merge.MergeOrder mergeOrder) [0x0001c] in <78c3b836c1b14be181b16a096f6abac0>:0
at ChorusMerge.Program.Main (System.String[] args) [0x00054] in <e143db9c80ed434ebc9f5d8cc73a5224>:0
merging test.a9a failed!

Error:Also had this in the standard output:
Error:merging test.a9a
Running ChorusMerge.exe...
ChorusMerge: /tmp/ChorusTest-sally-ac176603-25c6-42d3-ad5a-742ed14f0f47/foo project/test.a9a, /tmp/hgmerge-_gkaxlj3/test~base.a9a, /tmp/hgmerge-_gkaxlj3/test~other.a9a
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon

Error:Unable to complete the send/receive.
Error:Rolling back...
Error:Unable to complete the send/receive.
Error:Unable to complete the send/receive.
Error:You may need expert help.
"
  at LibChorus.TestUtilities.RepositoryWithFilesSetup.AssertNoErrorsReported () [0x0001a] in <29dc16831e374902b9fee81b01069753>:0 
  at LibChorus.Tests.sync.SynchronizerBadSituationTests.Sync_MergeWhenThereIsMoreThanOneHeadToMergeWith_MergesBoth () [0x000f4] in <319370d7f1fb494fa3976b76fe610d9a>:0
TestRepository Created: /tmp/ChorusTest-bob-da93b351-cc61-4331-a33f-4ecb678214e4
Storing changes in local repository...
Done
TestRepository Cloned: /tmp/ChorusTest-sally-ac176603-25c6-42d3-ad5a-742ed14f0f47
Trying to Create repository clone at /tmp/ChorusTest-sally-ac176603-25c6-42d3-ad5a-742ed14f0f47/foo project
  Creating new repository at /tmp/ChorusTest-sally-ac176603-25c6-42d3-ad5a-742ed14f0f47/foo project
Storing changes in local repository...
Done
Storing changes in local repository...
Done
Storing changes in local repository...
Done
Storing changes in local repository...
Done
Storing changes in local repository...
Done
Storing changes in local repository...
Connecting to bob...
Receiving any changes from bob
Merging sally and bob...
Error: ChorusMerge Error: You must create at least one LocalizationManager before trying to localize any strings.
at L10NSharp.LocalizationManagerInternal`1[T].GetStringFromAnyLocalizationManager (System.String stringId) [0x00013] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText, System.String comment, System.String englishToolTipText, System.String englishShortcutKey, System.ComponentModel.IComponent component) [0x00030] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText, System.String comment) [0x00000] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManager.GetString (System.String stringId, System.String englishText, System.String comment) [0x00006] in <1347b3563c3949cc9cd23b334d253edd>:0
at Chorus.merge.xml.generic.Conflict.get_KeptChangePattern () [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.Conflict.AppendWhatHappened (System.Text.StringBuilder sb) [0x00029] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.Conflict.MakeHtmlDetails (System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlMaker) [0x00081] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator, Chorus.merge.xml.generic.XmlMerger merger, System.Xml.XmlNode nodeToFindGeneratorFrom) [0x0002f] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext) [0x0000b] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.FileTypeHandlers.DefaultFileTypeHandler.Do3WayMerge (Chorus.merge.MergeOrder mergeOrder) [0x0001c] in <78c3b836c1b14be181b16a096f6abac0>:0
at ChorusMerge.Program.Main (System.String[] args) [0x00054] in <e143db9c80ed434ebc9f5d8cc73a5224>:0
merging test.a9a failed!

Error: Also had this in the standard output:
Error: merging test.a9a
Running ChorusMerge.exe...
ChorusMerge: /tmp/ChorusTest-sally-ac176603-25c6-42d3-ad5a-742ed14f0f47/foo project/test.a9a, /tmp/hgmerge-_gkaxlj3/test~base.a9a, /tmp/hgmerge-_gkaxlj3/test~other.a9a
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon

Error: Exception: 
Error: Unable to complete the send/receive.
Error:   at Chorus.sync.Synchronizer.ExplainAndThrow (System.Exception exception, Chorus.sync.Synchronizer+WhatToDo whatToDo, System.String explanation, System.Object[] args) [0x00014] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.sync.Synchronizer.MergeHeads () [0x000ea] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.sync.Synchronizer.MergeHeadsOrRollbackAndThrow (Chorus.VcsDrivers.Mercurial.HgRepository repo, Chorus.VcsDrivers.Mercurial.Revision workingRevBeforeSync) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0 
  Error: Inner: 
  Error: Exception: 
  Error: ChorusMerge Error: You must create at least one LocalizationManager before trying to localize any strings.
at L10NSharp.LocalizationManagerInternal`1[T].GetStringFromAnyLocalizationManager (System.String stringId) [0x00013] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText, System.String comment, System.String englishToolTipText, System.String englishShortcutKey, System.ComponentModel.IComponent component) [0x00030] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText, System.String comment) [0x00000] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManager.GetString (System.String stringId, System.String englishText, System.String comment) [0x00006] in <1347b3563c3949cc9cd23b334d253edd>:0
at Chorus.merge.xml.generic.Conflict.get_KeptChangePattern () [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.Conflict.AppendWhatHappened (System.Text.StringBuilder sb) [0x00029] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.Conflict.MakeHtmlDetails (System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlMaker) [0x00081] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator, Chorus.merge.xml.generic.XmlMerger merger, System.Xml.XmlNode nodeToFindGeneratorFrom) [0x0002f] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext) [0x0000b] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.FileTypeHandlers.DefaultFileTypeHandler.Do3WayMerge (Chorus.merge.MergeOrder mergeOrder) [0x0001c] in <78c3b836c1b14be181b16a096f6abac0>:0
at ChorusMerge.Program.Main (System.String[] args) [0x00054] in <e143db9c80ed434ebc9f5d8cc73a5224>:0
merging test.a9a failed!

  Error:   at Chorus.VcsDrivers.Mercurial.HgRepository.Merge (System.String localRepositoryPath, System.String revisionNumber) [0x000de] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.sync.Synchronizer.MergeTwoChangeSets (Chorus.VcsDrivers.Mercurial.Revision head, Chorus.VcsDrivers.Mercurial.Revision theirHead) [0x00031] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.sync.Synchronizer.MergeHeads () [0x00097] in <78c3b836c1b14be181b16a096f6abac0>:0 
Error: Rolling back...
Error: Unable to complete the send/receive.
Error: Unable to complete the send/receive.
Error: You may need expert help.
TestRepository deleted /tmp/ChorusTest-sally-ac176603-25c6-42d3-ad5a-742ed14f0f47
TestRepository deleted /tmp/ChorusTest-bob-da93b351-cc61-4331-a33f-4ecb678214e4

Check warning on line 0 in /

See this annotation in the file changed.

@github-actions github-actions / Test Results

All 4 runs failed: CanShareConflictingChangeViaUsb 

artifacts/Test Results (ubuntu-latest)/output/Release/net462/TestResults/LibChorus.Tests.xml
artifacts/Test Results (ubuntu-latest)/output/Release/net8.0/TestResults/LibChorus.Tests.xml
artifacts/Test Results (windows-latest)/output/Release/net462/TestResults/LibChorus.Tests.xml
artifacts/Test Results (windows-latest)/output/Release/net8.0/TestResults/LibChorus.Tests.xml
Raw output 
System.IO.FileNotFoundException : Could not find file "/tmp/ChorusSyncScenarioTests/dc8d23e6-8930-4211-900c-ec044212aeb9/USB-A/LP/lexicon/foo.abc.ChorusNotes"
  at System.IO.FileStream..ctor (System.String path, System.IO.FileMode mode, System.IO.FileAccess access, System.IO.FileShare share, System.Int32 bufferSize, System.Boolean anonymous, System.IO.FileOptions options) [0x0019e] in <d636f104d58046fd9b195699bcb1a744>:0 
  at System.IO.FileStream..ctor (System.String path, System.IO.FileMode mode, System.IO.FileAccess access, System.IO.FileShare share, System.Int32 bufferSize) [0x00000] in <d636f104d58046fd9b195699bcb1a744>:0 
  at (wrapper remoting-invoke-with-check) System.IO.FileStream..ctor(string,System.IO.FileMode,System.IO.FileAccess,System.IO.FileShare,int)
  at System.Xml.XmlDownloadManager.GetStream (System.Uri uri, System.Net.ICredentials credentials, System.Net.IWebProxy proxy, System.Net.Cache.RequestCachePolicy cachePolicy) [0x00018] in <85a6f94291a343ff91c1b4fbe148aeff>:0 
  at System.Xml.XmlUrlResolver.GetEntity (System.Uri absoluteUri, System.String role, System.Type ofObjectToReturn) [0x00032] in <85a6f94291a343ff91c1b4fbe148aeff>:0 
  at System.Xml.XmlTextReaderImpl.OpenUrlDelegate (System.Object xmlResolver) [0x0000c] in <85a6f94291a343ff91c1b4fbe148aeff>:0 
  at System.Xml.XmlTextReaderImpl.OpenUrl () [0x0005e] in <85a6f94291a343ff91c1b4fbe148aeff>:0 
  at System.Xml.XmlTextReaderImpl.Read () [0x00093] in <85a6f94291a343ff91c1b4fbe148aeff>:0 
  at System.Xml.XmlLoader.Load (System.Xml.XmlDocument doc, System.Xml.XmlReader reader, System.Boolean preserveWhitespace) [0x000a6] in <85a6f94291a343ff91c1b4fbe148aeff>:0 
  at System.Xml.XmlDocument.Load (System.Xml.XmlReader reader) [0x0002e] in <85a6f94291a343ff91c1b4fbe148aeff>:0 
  at System.Xml.XmlDocument.Load (System.String filename) [0x00013] in <85a6f94291a343ff91c1b4fbe148aeff>:0 
  at SIL.TestUtilities.AssertFile.get_NodeOrDom () [0x00005] in <add4fee3c43544078ac8a6133bb72e06>:0 
  at SIL.TestUtilities.AssertXmlCommands.HasSpecifiedNumberOfMatchesForXpath (System.String xpath, System.Int32 count, System.Boolean verbose, System.Xml.XmlNamespaceManager nameSpaceManager) [0x00014] in <add4fee3c43544078ac8a6133bb72e06>:0 
  at SIL.TestUtilities.AssertXmlCommands.HasSpecifiedNumberOfMatchesForXpath (System.String xpath, System.Int32 count, System.Xml.XmlNamespaceManager nameSpaceManager) [0x00000] in <add4fee3c43544078ac8a6133bb72e06>:0 
  at LibChorus.Tests.sync.SyncScenarioTests.CanShareConflictingChangeViaUsb () [0x001db] in <319370d7f1fb494fa3976b76fe610d9a>:0 
  at (wrapper managed-to-native) System.Reflection.RuntimeMethodInfo.InternalInvoke(System.Reflection.RuntimeMethodInfo,object,object[],System.Exception&)
  at System.Reflection.RuntimeMethodInfo.Invoke (System.Object obj, System.Reflection.BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x0006a] in <d636f104d58046fd9b195699bcb1a744>:0
Storing changes in local repository...
Done
Storing changes in local repository...
Done
Trying to Create repository clone at /tmp/ChorusSyncScenarioTests/dc8d23e6-8930-4211-900c-ec044212aeb9/USB-A/LP
  Creating new repository at /tmp/ChorusSyncScenarioTests/dc8d23e6-8930-4211-900c-ec044212aeb9/USB-A/LP
Trying to Create repository clone at /tmp/ChorusSyncScenarioTests/dc8d23e6-8930-4211-900c-ec044212aeb9/sally/LP
  Creating new repository at /tmp/ChorusSyncScenarioTests/dc8d23e6-8930-4211-900c-ec044212aeb9/sally/LP
Storing changes in local repository...
Done
Storing changes in local repository...
Connecting to usba source...
Receiving any changes from usba source
Sending changes to usba source
Done
Storing changes in local repository...
Connecting to usba source...
Receiving any changes from usba source
Merging bob and sally...
Error: ChorusMerge Error: You must create at least one LocalizationManager before trying to localize any strings.
at L10NSharp.LocalizationManagerInternal`1[T].GetStringFromAnyLocalizationManager (System.String stringId) [0x00013] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText, System.String comment, System.String englishToolTipText, System.String englishShortcutKey, System.ComponentModel.IComponent component) [0x00030] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText, System.String comment) [0x00000] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManager.GetString (System.String stringId, System.String englishText, System.String comment) [0x00006] in <1347b3563c3949cc9cd23b334d253edd>:0
at Chorus.merge.xml.generic.Conflict.get_KeptChangePattern () [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.Conflict.AppendWhatHappened (System.Text.StringBuilder sb) [0x00029] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.Conflict.MakeHtmlDetails (System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlMaker) [0x00081] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator, Chorus.merge.xml.generic.XmlMerger merger, System.Xml.XmlNode nodeToFindGeneratorFrom) [0x0002f] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext) [0x0000b] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.FileTypeHandlers.DefaultFileTypeHandler.Do3WayMerge (Chorus.merge.MergeOrder mergeOrder) [0x0001c] in <78c3b836c1b14be181b16a096f6abac0>:0
at ChorusMerge.Program.Main (System.String[] args) [0x00054] in <e143db9c80ed434ebc9f5d8cc73a5224>:0
merging lexicon/foo.abc failed!

Error: Also had this in the standard output:
Error: merging lexicon/foo.abc
Running ChorusMerge.exe...
ChorusMerge: /tmp/ChorusSyncScenarioTests/dc8d23e6-8930-4211-900c-ec044212aeb9/Bob/LP/lexicon/foo.abc, /tmp/hgmerge-oyxoldga/foo~base.abc, /tmp/hgmerge-oyxoldga/foo~other.abc
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon

Error: Exception: 
Error: Unable to complete the send/receive.
Error:   at Chorus.sync.Synchronizer.ExplainAndThrow (System.Exception exception, Chorus.sync.Synchronizer+WhatToDo whatToDo, System.String explanation, System.Object[] args) [0x00014] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.sync.Synchronizer.MergeHeads () [0x000ea] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.sync.Synchronizer.MergeHeadsOrRollbackAndThrow (Chorus.VcsDrivers.Mercurial.HgRepository repo, Chorus.VcsDrivers.Mercurial.Revision workingRevBeforeSync) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0 
  Error: Inner: 
  Error: Exception: 
  Error: ChorusMerge Error: You must create at least one LocalizationManager before trying to localize any strings.
at L10NSharp.LocalizationManagerInternal`1[T].GetStringFromAnyLocalizationManager (System.String stringId) [0x00013] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText, System.String comment, System.String englishToolTipText, System.String englishShortcutKey, System.ComponentModel.IComponent component) [0x00030] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManagerInternal`1[T].GetString (System.String stringId, System.String englishText, System.String comment) [0x00000] in <1347b3563c3949cc9cd23b334d253edd>:0
at L10NSharp.LocalizationManager.GetString (System.String stringId, System.String englishText, System.String comment) [0x00006] in <1347b3563c3949cc9cd23b334d253edd>:0
at Chorus.merge.xml.generic.Conflict.get_KeptChangePattern () [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.Conflict.AppendWhatHappened (System.Text.StringBuilder sb) [0x00029] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.Conflict.MakeHtmlDetails (System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlMaker) [0x00081] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator, Chorus.merge.xml.generic.XmlMerger merger, System.Xml.XmlNode nodeToFindGeneratorFrom) [0x0002f] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext, Chorus.merge.xml.generic.IGenerateHtmlContext htmlContextGenerator) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict, System.Xml.XmlNode oursContext, System.Xml.XmlNode theirsContext, System.Xml.XmlNode ancestorContext) [0x0000b] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.merge.xml.generic.XmlMergeService.AddConflictToListener (Chorus.merge.xml.generic.IMergeEventListener listener, Chorus.merge.IConflict conflict) [0x00000] in <78c3b836c1b14be181b16a096f6abac0>:0
at Chorus.FileTypeHandlers.DefaultFileTypeHandler.Do3WayMerge (Chorus.merge.MergeOrder mergeOrder) [0x0001c] in <78c3b836c1b14be181b16a096f6abac0>:0
at ChorusMerge.Program.Main (System.String[] args) [0x00054] in <e143db9c80ed434ebc9f5d8cc73a5224>:0
merging lexicon/foo.abc failed!

  Error:   at Chorus.VcsDrivers.Mercurial.HgRepository.Merge (System.String localRepositoryPath, System.String revisionNumber) [0x000de] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.sync.Synchronizer.MergeTwoChangeSets (Chorus.VcsDrivers.Mercurial.Revision head, Chorus.VcsDrivers.Mercurial.Revision theirHead) [0x00031] in <78c3b836c1b14be181b16a096f6abac0>:0 
  at Chorus.sync.Synchronizer.MergeHeads () [0x00097] in <78c3b836c1b14be181b16a096f6abac0>:0 
Error: Rolling back...
Error: Unable to complete the send/receive.
Error: Unable to complete the send/receive.
Error: You may need expert help.

Check warning on line 0 in /

See this annotation in the file changed.

@github-actions github-actions / Test Results

After2Syncs_HistoryHas2 failed 

artifacts/Test Results (windows-latest)/output/Release/net462/TestResults/Chorus.Tests.xml
Raw output 
System.InvalidOperationException : You must create at least one LocalizationManager before trying to localize any strings.
   at L10NSharp.LocalizationManagerInternal`1.GetStringFromAnyLocalizationManager(String stringId)
   at L10NSharp.LocalizationManagerInternal`1.GetString(String stringId, String englishText, String comment, String englishToolTipText, String englishShortcutKey, IComponent component)
   at Chorus.UI.Review.RevisionsInRepository.RevisionInRepositoryModel.BeginGettingRevisions() in D:\a\chorus\chorus\src\Chorus\UI\Review\RevisionsInRepository\RevisionInRepositoryModel.cs:line 134
   at Chorus.UI.Review.RevisionsInRepository.RevisionInRepositoryModel.GetAllRevisions() in D:\a\chorus\chorus\src\Chorus\UI\Review\RevisionsInRepository\RevisionInRepositoryModel.cs:line 94
   at Chorus.Tests.HistoryPanelModelTests.After2Syncs_HistoryHas2() in D:\a\chorus\chorus\src\Chorus.Tests\UI\Review\HistoryPanelModelTests.cs:line 85

Check warning on line 0 in /

See this annotation in the file changed.

@github-actions github-actions / Test Results

After2Syncs_WithFilter_OnlyFilteredItemsShown failed 

artifacts/Test Results (windows-latest)/output/Release/net462/TestResults/Chorus.Tests.xml
Raw output 
System.InvalidOperationException : You must create at least one LocalizationManager before trying to localize any strings.
   at L10NSharp.LocalizationManagerInternal`1.GetStringFromAnyLocalizationManager(String stringId)
   at L10NSharp.LocalizationManagerInternal`1.GetString(String stringId, String englishText, String comment, String englishToolTipText, String englishShortcutKey, IComponent component)
   at Chorus.UI.Review.RevisionsInRepository.RevisionInRepositoryModel.BeginGettingRevisions() in D:\a\chorus\chorus\src\Chorus\UI\Review\RevisionsInRepository\RevisionInRepositoryModel.cs:line 134
   at Chorus.UI.Review.RevisionsInRepository.RevisionInRepositoryModel.GetAllRevisions() in D:\a\chorus\chorus\src\Chorus\UI\Review\RevisionsInRepository\RevisionInRepositoryModel.cs:line 94
   at Chorus.Tests.HistoryPanelModelTests.After2Syncs_WithFilter_OnlyFilteredItemsShown() in D:\a\chorus\chorus\src\Chorus.Tests\UI\Review\HistoryPanelModelTests.cs:line 99

Check warning on line 0 in /

See this annotation in the file changed.

@github-actions github-actions / Test Results

BeforeAnySyncing_EmptyHistory failed 

artifacts/Test Results (windows-latest)/output/Release/net462/TestResults/Chorus.Tests.xml
Raw output 
System.InvalidOperationException : You must create at least one LocalizationManager before trying to localize any strings.
   at L10NSharp.LocalizationManagerInternal`1.GetStringFromAnyLocalizationManager(String stringId)
   at L10NSharp.LocalizationManagerInternal`1.GetString(String stringId, String englishText, String comment, String englishToolTipText, String englishShortcutKey, IComponent component)
   at Chorus.UI.Review.RevisionsInRepository.RevisionInRepositoryModel.BeginGettingRevisions() in D:\a\chorus\chorus\src\Chorus\UI\Review\RevisionsInRepository\RevisionInRepositoryModel.cs:line 134
   at Chorus.UI.Review.RevisionsInRepository.RevisionInRepositoryModel.GetAllRevisions() in D:\a\chorus\chorus\src\Chorus\UI\Review\RevisionsInRepository\RevisionInRepositoryModel.cs:line 94
   at Chorus.Tests.HistoryPanelModelTests.BeforeAnySyncing_EmptyHistory() in D:\a\chorus\chorus\src\Chorus.Tests\UI\Review\HistoryPanelModelTests.cs:line 72

Check warning on line 0 in /

See this annotation in the file changed.

@github-actions github-actions / Test Results

CanMakeNotesBarWithOtherFiles failed 

artifacts/Test Results (windows-latest)/output/Release/net462/TestResults/Chorus.Tests.xml
Raw output 
System.InvalidOperationException : You must create at least one LocalizationManager before trying to localize any strings.
   at L10NSharp.LocalizationManagerInternal`1.GetStringFromAnyLocalizationManager(String stringId)
   at L10NSharp.LocalizationManagerInternal`1.GetString(String stringId, String englishText, String comment, String englishToolTipText, String englishShortcutKey, IComponent component)
   at Chorus.UI.Notes.Bar.NotesBarView.AddNoteCreationControl() in D:\a\chorus\chorus\src\Chorus\UI\Notes\Bar\NotesBarView.cs:line 130
   at Chorus.UI.Notes.Bar.NotesBarView.OnUpdateContent(Object sender, EventArgs e) in D:\a\chorus\chorus\src\Chorus\UI\Notes\Bar\NotesBarView.cs:line 67
   at Chorus.UI.Notes.Bar.NotesBarModel.UpdateContentNow() in D:\a\chorus\chorus\src\Chorus\UI\Notes\Bar\NotesBarModel.cs:line 73
   at Chorus.Tests.ChorusSystemTests.CanMakeNotesBarWithOtherFiles() in D:\a\chorus\chorus\src\Chorus.Tests\ChorusSystemTests.cs:line 87

Check notice on line 0 in .github

See this annotation in the file changed.

@github-actions github-actions / Test Results

56 skipped tests found 

There are 56 skipped tests, see "Raw output" for the full list of skipped tests.
Raw output 
BadMercurialIni_Throws
Clone_Test
CreateHistoryPage
CreateWithInstalledHandlers_ContainsTestAFileTypeHandler
ExternalFileModification_NotifiesIndices_ButSaveDoesNot
FindServer_NoServerFound_Null
GetCommonAncestorOfRevisions_Have3rdAsCommon_Get3rd
GetFilesInRevision_RevisionsParentNumberIsNotJustNumberMinus1_GivesCorrectFiles
GetRepositoryNames_TwoItemsInHubFolder_GetOneItemWithProjectFilter
GetRepostoryNames_ThreeItemsInHubFolder_GetTwoItemsWithProjectFilter
GetRepostoryNames_TwoItemsInHubFolder_GetNoneForProjectFilter
GetRepostoryNames_TwoItemsInHubFolder_GetTwoItems
LaunchDialog_AutoWithMinimalUI
LaunchDialog_BogusTarget_AdmitsError
LaunchDialog_CustomAddress
LaunchDialog_CustomSourceWillBeFound
LaunchDialog_CustomUrlSourceWontBeFound
LaunchDialog_ExampleForBob
LaunchDialog_FullAddress
LaunchDialog_GoodAddressNoFolder
LaunchDialog_GoodAddressWithFolderName
LaunchDialog_GoodForCancelTesting
LaunchDialog_LazyWithAdvancedUI
LaunchDialog_LazyWithNormalUI
LaunchDialog_LiveTest_FilterOutParatext
LaunchDialog_MinimalUI
LaunchDialog_SimulatedUsb_ProjectAlreadyExists
LaunchDialog_SimulatedUsb_USBHasInvalidRepo
LaunchUI_Blank
LaunchWithPreformedSettings
MetaData_Merged
MetaData_Preserved
MinimalCodeToLaunchSendReceiveUI
MultipleAttributeKeyedElement_WithDoubleAndSingleQuoteInAttribute_IsFound
NewerLiftVersion_Handled
OlderLiftVersion_Handled
OneEditedExampleWhileOtherAddedTranslation_MergesButRaiseWarning
PullThenPush_Test
Pull_FileIsLocked_GetTimeoutException
Pull_Test
QuitelyMilestoneSomeRecentWork
ReorderedEntry_Reordered
ShowIt
ShowNotesBar
ShowNotesBrowser_LargeNumber
ShowNotesBrowser_SmallNumber
ShowSyncDialog_InternetAndNetworkPaths
ShowSyncDialog_InternetAndNetworkPaths_WindowsStyle
ShowSyncStartControl_NoPaths
ShowSynchronizationDialogWhichGivesUsersChoices
SyncNow_BackupAlreadySetUp_GetsSync
Sync_GetUsbStatusLink_MultipleUsb
Sync_GetUsbStatusLink_OneUsb
Test_GetProxyAndCredentials
Utf8ExtensionPresent_LocalMercurialIniIncorrect_MercurialOpStillWorks
ValidateFile_BadLift_ReturnsProblem

Check notice on line 0 in .github

See this annotation in the file changed.

@github-actions github-actions / Test Results

989 tests found 

There are 989 tests, see "Raw output" for the full list of tests.
Raw output 
AddAndCheckinFile_WLockExists_GetTimeoutException
AddAndCheckinFiles_UserNameHasASpace_DoesnotDie
AddAnnotation_NotifiesIndices
AddButtonClicked_NewMessageHasContents_NewMessageAppendedToAnnotation
AddIndex_AddSameIndexTwice_Throws
AddIndex_CallInitializeOnIndex
AddMessage_Had0_Has1
AddMessage_Had1_Has2InCorrectOrder
AddUtf8FileName_CloneUpdatedFileExists
AddingRepositoryWithinAnotherRepositoryFromDirectoryNameIsDifferentRepository
AddingRepositoryWithinAnotherRepositoryFromFileNameIsDifferentRepository
AddingRepositoryWithinAnotherRepositoryWithEmptyStringDirectoryThrows
AddingRepositoryWithinAnotherRepositoryWithNonexistantDirectoryThrows
AddingRepositoryWithinAnotherRepositoryWithNonexistantFileThrows
AddingRepositoryWithinAnotherRepositoryWithNullDirectoryThrows
After2Syncs_HistoryHas2
After2Syncs_WithFilter_OnlyFilteredItemsShown
AllElementsNullCausesNoTrouble
AllFilesMissingThrows
AllHadProperty_ButNothingElse
AllNullNodesThrows
AllNullsIsNotTextlevel
AllSettingsUseCrossPlatformProvider
AmbiguousInsertWhenOtherReordered
AncestorAndOursAreEmptyFileAndTheyAddedHasOneChangeReport
AncestorAndTheirsAreEmptyFileAndWeAddedHasOneChangeReport
AncestorHasDataAndWeBothDeletedFileHasOneChangeReport
AncestorIsEmptyFileAndBothAddedSameThingHasOneChangeReport
AncestorIsEmptyFileAndWeBothAddedDifferentContentHasOneConflictReport
AncestorIsEmptyFileAndWeBothAddedDifferentContentWithTheyWinHasOneConflictReport
AncestorIsNotXmlThrows
AncestorNull_BothAddSameElementAndContent_HasChangeReport
AncestorNull_OursNotNull_TheirsNull_HasChangeReport_AndOursIsKeptInMerge
AncestorNull_OursNull_TheirsNotNull_HasChangeReport_AndTheirsIsKeptInMerge
AsyncLocalCheckIn_GivesGoodResult
AsyncLocalCheckIn_NoHgLockWarningWithMultipleWorkers
AsyncLocalCheckIn_NoPreviousRepoCreation_Throws
Author_HasAuthor_ReturnsAuthor
BackoutHead_BackingOutTheCurrentHead_LeaveUsOnTheNewHead
BackoutHead_CurrentlyOnAnotherBranch_LeaveUsWhereWeWere
BackoutHead_FirstChangeSetInTheRepo_Throws
BackoutHead_UsesCommitMessage
BadMercurialIni_Throws
BasicCommitHasCommitFileButNotMergeFile
BeforeAnySyncing_EmptyHistory
BothAddedANephewElementWithKeyAttr
BothAddedAnUnkeyableNephewElement
BothAddedDifferentAtomicOwnedElementToNewProperty
BothAddedHeaderButWithDifferentContentInEach
BothAddedMainItemButWithDifferentContentHasOneConflictReport
BothAddedMainItemWithSameContentHasNoChangeReport
BothAddedNewConflictingStuffHasConflictReport
BothAddedNewFileWithConflictingDataHasConflict
BothAddedNewFileWithNonConflictingDataHasNoChangeReports
BothAddedNewProperty_ButNothingElse
BothAddedNewProperty_TheyAddedAtomicValue_WeDidNotAddAtomicValue
BothAddedNewProperty_WeAddedAtomicValue_TheyDidNotAddAtomicValue
BothAddedOptionalFirstElement
BothAddedOptionalFirstElementButWithDifferentContentHasOneConflictReport
BothAddedSameAtomicOwnedElementToExtantPropertyButWithDifferencesInTheInnards
BothAddedSameAtomicOwnedElementToNewProperty
BothAddedSameAtomicOwnedElementToNewPropertyButWithDifferencesInTheInnards
BothAddedSameAtomicOwnedElementToNewPropertyButWithDifferencesInTheInnards_TheyWin
BothAddedSameAttributeDifferentValueTheyWin
BothAddedSameAttributeDifferentValueWeWin
BothAddedSameAttributeWithSameValueHasOneChangeNoConflicts
BothAddedSameThingHasChangeReport
BothAddedTheSameThingHasChangeReport
BothAdded_ButNotTheSame_HasConflictForTheyWin_TheirChangeIsKept
BothAdded_ButNotTheSame_HasConflictForWeWin_OurChangeIsKept
BothDeletedAttributeHasOneChangeReportAndNoConflicts
BothDeletedElement_HasChangeReport
BothDeletedExtantOptionalFirstElement
BothDeletedMainItemHasNoChangeReport
BothDeletedNode
BothDeletedSameAtomicOwnedElement
BothDeletedTheTextStringButLeftTheNodeHasChangeReport
BothDeletedWithOneChangeReport1
BothDeletedWithOneChangeReport2
BothDeletedWithOneChangeReport3
BothDoSameEdit
BothEditWithConflictAndWeWin
BothEditedButDifferentlyAtomicElementWithConflict
BothEditedButNotTheSameEditsWeWinReportedAsConflict
BothEditedFoo_WithEditVsDeleteOfBar_AndNoChangesToDull_ProducesTwoConflictRreports
BothEditedMainItemSenseGlossButInDifferentWaysHasConflictReport
BothEditedOptionalFirstElementInDifferentWaysHasOneConflictReports
BothEditedTextConflict_RoundtripThroughXml
BothEditedTextStringButNotTheSameWayWeWinHasConflictReport
BothEditedWithConflictTheyWin
BothEditedWithConflictWeWin
BothInsertedSameInDifferentPlaces
BothInsertedStartEndInOrder
BothMadeChanges_MergeFailure_Fires_SimpleUpdate_WithTrue
BothMadeSameAttributeValueChangeHasOneChangeReportAndNoConflicts
BothMadeSameChangeHasChangeReport
BothMadeTheSameEditInTheTextStringHasChangeReport
BothModifiedExampleFormTextWorksWithConflict
BothSameReorder
BundleInCacheDoesNotWarn
CalculateEstimatedTimeRemaining_ExpectedTimeRemainingString
CalculateEstimatedTimeRemaining_VeryLargeBundleSize_DoesNotThrow
CanCollaborateOnLift
CanCreateNonStandardConflictType
CanCreateVersionNumberBranch_BackwardCompatibilityTest
CanDistinguishElementClosureAndEmptyElement
CanFindByMatchingAttributeNames
CanFindByMatchingAttributeNames_SkipsUnacceptable
CanGetNewFileFromAnotherRep
CanMakeNotesBarWithOtherFiles
CanMergeAFile
CanMergeGoodFwXmlFile
CanMergeGoodProjectLexiconSettingsFile
CanMergeGoodUserLexiconSettingsFile
CanPresentAGoodFile
CanSetToTrue
CanShareConflictingChangeViaUsb
CanShowNotesBar
CanShowNotesBrowserPage
CanValidateFile_AcceptsCorrectSet
CanValidate_IsFalse
Can_Validate_Fw_Xml_File
CannotDiffAFile
CannotMergeEmptyStringFile
CannotMergeNonexistantFile
CannotMergeNullFile
CannotPresentAFileWithOtherExtension
CannotPresentANullFile
CannotPresentAnEmptyFileName
CannotValidateAFile
Cannot_Validate_Empty_String_File
Cannot_Validate_Nonexistant_File
Cannot_Validate_Nonxml_File
Cannot_Validate_Null_File
ChangedUtf8File_FileCanBePulledAndUpdated
CharactersAreMerged
CheckBranchesGetsRightNumberOfBranches
CheckExtensions_AllExtensionsListedInIni
CheckExtensions_DisallowsAdditionalExtensions
CheckExtensions_ExtensionsAreMissing
CheckExtensions_ExtensionsSectionMissing
CheckExtensions_IniFileMissing
ClassSpansMerge
Class_HasClass_ReturnsClass
CleanUpAfterErrorOrCancel_DirectoryDeleted
CloneToUsbWithoutUpdateFollowedByIdentifierDoesNotAffectHgrc
Clone_LocalRepoEmpty_ReposAreIdentical
Clone_Test
CloseAnnotation_AnnotationFromFile_RepositoryNotifiesIndices
CloseAnnotation_AnnotationWasAddedDynamically_RepositoryNotifiesIndices
CloseIssue_AnnotationGetsNewMessageWithNewStatus
ClosedNodeAndEmptyNodeAreEqual
ClosedNodeAndEmptyNodeWithAttrsAreEqual
ClosedNodeAndNewTextAreNotEqual
ClosedNodeAndNewTextWithAttributesAreNotEqual
CommitCommentWithDoubleQuotes_HasCorrectComment
CommitWithMergeDoesNotThrowTryingNullSychronizerAdjunct
CommitWithMergeDoesNotThrowWithDefaultSychronizerAdjunct
CommitWithMergeHasCommitFileAndMergeFile
CommitWithNoUsernameInHgrcFileUsesDefaultFromEnvironment
Commit_WLockExists_GetTimeoutException
ConflictFileIsCheckedIn
ConflictWithInvalidUtf8DetailsWorks
Conflict_TheirsAppearsInCollisionNote
ConflictingReorder
Constructor_ExpiredData_DataIsRemoved
Constructor_LanguageForgeUrl_IdentityAndProjectIdSetCorrectly
Constructor_MultipleInstances_ManagesMultipleInstancesOk
Constructor_NoPreviousTransactionIdFile_FileIsCreatedAndPopulated
Constructor_PreviousTransactionIdFileExists_ReturnsFoundTransactionId
Constructor_PreviousTransactionIdFileNotExists_GetNewId
Constructor_PrivateLanguageForgeUrl_IdentityAndProjectIdSetCorrectly
Constructor_PullDataFolderNotExist_FolderCreated
Constructor_UrlHasQueryString
ConvertBogusElementToTextElementInLiftFile
ConvertBogusElementToTextElementInLiftRangesFile
CorrectlyAppendsLdmlVersion3ToBranchName
CorrectlyReturnsDefaultBranchNameOnLdml2Files
CreateARepositoryIfOneDoesntAlreadyExist
CreateAnnotation_CreatesNewAnotationUsingIdOfCurrentAnnotatedObject
CreateAnnotation_HaveCustomUrlGenerator_UseIt
CreateAnnotation_KeyHasDangerousCharacters_ResultingUrlHasThemEscaped
CreateBranchesTest
CreateFromConflictElement_ProducesDifferentConflictReports
CreateHistoryPage
CreateNotesBar
CreateNotesBrowser
CreateOrLocate_FolderHasAccentedLetter2_FindsIt
CreateOrLocate_FolderHasAccentedLetterAbeBooks_FindsIt
CreateOrLocate_FolderHasThaiAndAccentedLetter2_FindsIt
CreateOrphanAnnotation_DoesNotAddToRepository
CreateWithInstalledHandlers_ContainsHandlers
CreateWithInstalledHandlers_ContainsTestAFileTypeHandler
CreateWithInstalledHandlers_DefaultHandlerIsNotInMainCollection
CreateWithInstalledHandlers_HandlersFromAdditionalAssembly
CreateWithTestHandlerOnly_DefaultHandlerIsNotInTestCollection
CreateWithTestHandlerOnly_TestHandlerIsInTestCollection
Create_CorrectType("//DinosaurShare/OldChorus/Lom",Chorus.VcsDrivers.DirectoryRepositorySource)
Create_CorrectType("https://hg-public.languageforge.org/ngl-flex",Chorus.VcsDrivers.HttpRepositoryPath)
Date_HasDate_ReturnsDate
DecryptPassword_NullAndEmptyDoNotCrash
DefaultHtmlDetails_ContainsDiffsOfversions
DefaultHtmlDetails_ReportsOneDeleted
DefaultHtmlDetails_UsesClientHtmlGenerator
DefaultIsAtomic_Is_False
DefaultIsFalse
DefaultIsImmutable_Is_False
DefaultIsResumable
DefaultNumberOfChildren_Is_NumberOfChildrenAllowed_ZeroOrMore
DefaultUrlsAreIgnored
DeleteAtomicElementVsModifyHasConflict
DeleteNonAtomicElementVsModifyHasConflict
DeletionReport_Not_ProducedForDeletedAnnotationUsingNotesHandler
DeletionReport_Not_ProducedForDeletionInParentAndChild
Deletion_WasTombstoneNowMissing_NoDeletionReport
DelimitersAreMerged
DescribeInitialContentsShouldHaveAddedForLabel
DifferentInsertsAtSamePlaceConflict
Do3WayMergeThrowsOnNullInput
Do3WayMerge_NullInput_Throws
DoesNewBranchExist_No
DoesNewBranchExist_Yes
DoesNotTimeoutIfFinishedInTime
DoesNotTimeoutWithIntermediateOutput
DoomedByUs_NewWay_AndByThem_OldWay_HasNoChangeReports
DoomedByUs_OldWay_AndByThem_NewWay_HasNoChangeReports
DuplicateGuids_StillMergesWhatComesNext
DuplicateIdInChildEntryEmitsWarning
DuplicateIdInParentEntry_EmitsWarning
DuplicateRelationElementsDoesNotThrow
DuplicateSpecialElementsAreRemoved
DuplicateWritingSystemsElementsAreRemoved
EachAddedDifferentSyblings_GetBoth
EachAddedMainItemWithdifferentContentHasNoChangeReports
EachAddedOptionalFirstElement
EachDeletedExtantOptionalFirstElement
EachEditedOptionalFirstElementHasOneConflictReport
EachHasNewSense_BothSensesCoveyed
EachOneChangedOrAddedFileButNotSameFile_HasCommitAndPullAndMergeFilesOnly
ElementDeleteAndModifyConflict
ElementNodeWithElementNodeChildIsNotTextlevel
ElementNodeWithTextNodeChildIsTextlevel
ElementStrategy_CreateForKeyedElementInList_Has_FindByKeyAttributeInList_Finder
ElementStrategy_CreateForKeyedElement_Has_FindByKeyAttribute_Finder
ElementStrategy_CreateSingletonElement_Has_FindFirstElementWithSameName_Finder
EmptyElementNodeIsAnAmbiguousTextNode
Empty_Ancestor_Adds_Children_From_Both
EncryptPassword_NullAndEmptyDoNotCrash
EncryptPassword_RoundTrips
EnsureConflictClassHasContext
EnsureMaximumFileSize_HasNoLimit
EnsureMergedCData_IsRetained
EnsureRepoIdIsCorrect
EnsureTheseExtensionAreEnabled_AddingToExistingExtensions_NewAddedAndExistingNotDuplicated
EnsureTheseExtensionAreEnabled_ExtraExtensions_RemovesThem
EnsureTheseExtensionAreEnabled_noExistingExtensions_AddsThem
EntryRemovedByOther_Removed
EntryRemovedByUs_Removed
Enumerate_Empty_Ok
Enumerate_KeyHasMultiple_ReturnsBoth
EqualResultForDifferentAttributeSequences
EqualResultForIdenticalCDataElements
EqualResultForIdenticalSelfClosingElements
EqualResultForSameEmptyElements
EqualResultForSameReader
EquivalentByteArraysAreEqual
EscapeUrlForUseInXmlAttribute_Empty_ReturnEmpty
EscapeUrlForUseInXmlAttribute_HasQueryPortionWithAmpersand_ProperlyEscaped
EscapeUrlForUseInXmlAttribute_HasQueryPortionWithSingleQuote_ProperlyEscaped
ExcludeLdmlInRoot_FileNotAdded
ExcludedVideosFileNotAdded
ExplicitlyExcludedNonexistantFileNotFiltered
ExtantRepositories_FindsRepoInOtherRepoLocation
ExternalFileModification_NotifiesIndices_ButSaveDoesNot
FieldSectionMergedCorrectly
FileAlreadyExists_AddsNewConflicts
FileDeletedLocallyAndChangedRemotelyKeepsChanged
FileDeletedRemotelyAndChangedLocallyKeepsChanged
FileDidNotExist_CreatesCorrectFile
FileDidNotExist_NoConflicts_DoesNotCreatesEmptyNotesFile
FileOutput_WithContent_UsesCanonicalXmlSettings
FileWithSpecialCharacterIsAllowed
FilterStateMessage_HideAll_HideNone
Find2WayDifferencesShouldReportOneChangeEvenWhenNoneArePresent
Find2WayDifferencesShouldReportOneChangeNoMatterHowManyWereMade
FindServer_NoServerFound_Null
FindsCorrespondingMatchInSecondPlace
FindsNoMatchWhereTooFewOccurrences
FindsNothingInEmptyList
FindsNothingInNullList
FindsNothingWithNoKey
FindsSecondDuplicateWhereFirstNotAcceptable
FindsUniqueMatch
FontsAndCollationChangesMergeCleanly
FontsAreMerged
FormatUrl_FormatsCorrectlyWithEmptyParameters
FormatUrl_FormatsCorrectlyWithParameters
FromPath_DoesntExistYet_Creates
FromPath_ParentDirectoryPathDoesntExist_Throws
FromString_FormatIsBadXml_Throws
FromString_FormatIsTooNew_Throws
GenerateContextDescriptor_EntryHasGuid_XPathUsesGuid
GenerateContextDescriptor_EntryHasNoGuid_XPathUsesId
GenerateDateAttr_IsPreMerged
GetAliasFromPath_HasColon_GivesSafeAlias
GetAliasFromPath_HasEquals_GivesSafeAlias
GetAliasFromPath_IsDrivePlusPath_GivesSafeAlias
GetAllRevisionss_AfterSyncingTwoTimes_CorrectHistory
GetAllRevisionss_BeforeAnySyncing_EmptyHistory
GetAll_0OutOf1MatchFilter_Returns0
GetAll_2OutOf3MatchFilter_Returns2
GetAll_EmptyDOM_OK
GetAll_Has2_ReturnsBoth
GetAll_NoneInIndex_Returns0
GetAnnotationsToShow_ShowsAnnotationsFromFunctionToGoFromObjectToAdditionalIds
GetAnnotationsToShow_ShowsAnnotationsFromFunctionToGoFromObjectToItsId
GetBranchesTest
GetByCurrentStatus_NoMessages_ReturnsNone
GetByCurrentStatus_UsesTheLastMessage
GetChunk_First5Bytes_Ok
GetChunk_LengthTooLarge_ReturnsAdjustedByteArray
GetChunk_MiddleBytes_Ok
GetChunk_OffsetOutOfRange_EmptyByteArray
GetCommonAncestorOfRevisions_Have3rdAsCommon_Get3rd
GetDirectoriesWithMecurialRepos_NoDrivesFound_ReturnsEmptyList
GetDirectoriesWithMecurialRepos_OneDriveAndDirectoryButNotRep_ReturnsEmptyList
GetDirectoriesWithMecurialRepos_OneDriveOneRepo_ReturnsRepoPath
GetDirectoriesWithMecurialRepos_TwoRepos_ReturnsOnlyUnfilteredPath
GetDirectoriesWithMecurialRepos_WithRepo2DeepIsNotFound
GetEnvironmentReadinessMessageIsNull
GetExtensionsOfKnownTextFileTypesIsChorusNotes
GetExtensionsOfKnownTextFileTypesIsLiftRanges
GetFilesInRevision_MultipleRevisionsInRepo_GivesCorrectFiles
GetFilesInRevision_OnlyOneRevisionInRepo_GivesAllFiles
GetFilesInRevision_RevisionsParentNumberIsNotJustNumberMinus1_GivesCorrectFiles
GetFilteredStatusForFilesHasExpectedResults
GetGlobalProxyInfo_TODO
GetHtml
GetHtml_WithSingleAndDoubleQuoteInId_DoesNotThrow
GetIsReadyForInternetSendReceive_HasFullLangForgeUrlAndCachedCredentials_ReturnsTrue
GetIsReadyForInternetSendReceive_HasFullLangForgeUrlAndSavedCredentials_ReturnsTrue
GetIsReadyForInternetSendReceive_MissingPassword_ReturnsFalse
GetIsReadyForInternetSendReceive_MissingUsername_ReturnsFalse
GetIsReadyForInternetSendReceive_NoPaths_ReturnsFalse
GetKnownRepositories_NoneKnown_GivesNone
GetKnownRepositories_TwoInRepoSettings_GivesThem
GetLabel_RefHasLabel_ReturnsLabel
GetMatchesByKey_HasAnnotationWithoutRef_DoesntCrash
GetMatchesByKey_HasTwoMatches_Found
GetMatchesOfKey_Has0Matches_ReturnsNone
GetMatchesOfKey_ReturnsMatchingItems
GetMatches_AddedAfterIndexInitialization_FoundViaPredicate
GetMatches_AddedBeforeIndexInitialization_FoundViaPredicate
GetMatches_Has0Matches_ReturnsNone
GetMatches_Has2Matches_Returns2
GetMatches_PredicateGivesNullForOne_ReturnsIt
GetMergedLift_ConflictingGlosses_ListenerIsNotifiedOfBothEditedConflict
GetMergedLift_LiftConflicts_IndentingIsCorrect
GetMergedLift_LiftHasNoConflicts_IndentingIsCorrect
GetMergedLift_LiftIsUnchanged_IndentingIsCorrect
GetMergedLift_MysteryDroppedGloss
GetMessages
GetMessages_FilesInSubDirs_GetsThemAll
GetMessages_HideNotificationsAndConflicts_HidesCorrectItems
GetMessages_NoNotesFiles_GivesZeroMessages
GetMessages_ReturnsMostRecentMessagePassingFilterInAnnotation
GetMessages_SearchContainsAuthor_FindsMatches
GetMessages_SearchContainsClassInWrongUpperCase_FindsMatches
GetMessages_SearchContainsClass_FindsMatches
GetMessages_SearchContainsWordInMessageInUpperCase_FindsMatches
GetMessages_ShowQuestionsFalse_HidesQuestions
GetNodeToMerge_ReturnsNode
GetNodeToMerge_TextOnlyRegression_DoesntThrow
GetNodeToMerge_WithDoubleAndSingleQuotesInAttribute_FindsIt
GetNodeToMerge_WithDoubleQuoteInAttribute_FindsIt
GetNodeToMerge_WithSingleQuoteInAttribute_NoThrow
GetNodeToMerge_WithoutKeyAttr_ReturnsNull
GetNotesBarAndBrowser_MakeNewAnnotationWithBar_BrowserSeesIt
GetNotesRepository
GetPassword_EmptyPath_ReturnsEmptyString
GetPassword_HasPathOnly_ReturnsEmptyString
GetPassword_HasUserAndPass_ReturnsPassword
GetPassword_HasUserOnly_ReturnsEmptyString
GetPathOnly_HasPathAndQuery_ReturnsPathOnly
GetPotentialRepoUri_InsertsEscapedCredentials
GetPotentialRepoUri_LeavesExistingUserInfo
GetPotentialRepoUri_ReplacesProjectNameVariable
GetPotentialRepoUri_ToleratesNullProjectName
GetRecord_GoodRecordInfo_ReturnsRecord
GetRepositoriesToList_NoRepositoriesKnown_GivesUsb
GetRepositoryNames_TwoItemsInHubFolder_GetOneItemWithProjectFilter
GetRepostoryNames_ThreeItemsInHubFolder_GetTwoItemsWithProjectFilter
GetRepostoryNames_TwoItemsInHubFolder_GetNoneForProjectFilter
GetRepostoryNames_TwoItemsInHubFolder_GetTwoItems
GetResult(Abort,"E:\\elsewhere",NotCreated)
GetResult(Cancel,"S:\\miles",Cancelled)
GetResult(None,"~/no/where",NotCreated)
GetResult(OK,"C:\\somewhere",Created)
GetRevisionWorkingSetIsBasedOn_NoCheckinsYet_GivesNull
GetRevisionWorkingSetIsBasedOn_OneCheckin_Gives0
GetRevision_RevisionDoesExist_Ok
GetRevision_RevisionDoesntExist_GivesNull
GetRevision_WithOneCommit_HasExpectedRevisionValues
GetRevision_WithTwoCommits_HasExpectedRevisionValuesForSecondCommit
GetTip_AfterSyncing_GetTip
GetTip_BeforeAnySyncing_EmptyString
GetUserIdInUse_Fallback
GetUserIdInUse_Internet
GetUserIdInUse_Local
GetUserName_EmptyHgrc_ReturnsDefault
GetUserName_EmptyPath_ReturnsEmptyString
GetUserName_HasPathOnly_ReturnsEmptyString
GetUserName_HasUserAndPassword_ReturnsUserName
GetUserName_HasUserOnly_ReturnsUserName
GetUserName_NameInLocalRepoHasSpace_GetsName
GetUserName_NameInLocalRepo_GetsName
GetUserName_NoHgrcYet_ReturnsDefault
GetValueFromQueryStringOfRef_HasEscapedSpaceInName_StillGetsValue
GetValueFromQueryStringOfRef_HasNoSpaceInName_StillGetsValue
GuidAttrBeforeIdAttrDoesNotGenerateReports
Guid_HasGuid_ReturnsGuid
HandlerOnlySupportsProjectLexiconSettingsExtension
HandlerOnlySupportsUserLexiconSettingsExtension
HandlerOnlySupportsldmlExtension
HandlerShouldOnlyProcessMegabyteSizedFiles
HandlerShouldProcessMaximumFileSize
HandlerShouldProcessOnlyTenMegabyteSizedFiles
HandlerSupportsCorrectExtensions
HasExtantRepositories
HasFileHandlers_ValidCommit_Validates_DoesNothing
HasFileHandlers_Validates_DoesNothing
HasNoExtantRepositories
HattonTempCheck
HgMerge_LaunchesChorusMerge
HtmlText_HadCData_ResultContainsHyperlink
HtmlText_HasHtmlTagsAndData_GetJustHtml
HtmlText_HasHtmlTags_TagsPreserved
HtmlText_HasNoCData_ResultContainsNoHyperlink
HtmlText_HasOnlyData_GetEmptyString
IdHasEntityDoesNotGenerateReports
IdenticalNewKnownKeyboards_AreMerged
IdentityIsMerged
IncludeAllButExcludeOne_FileNotAdded
IncludeFilesInSubFolders
IncludeInGeneralButExcludeInSubfolder_FileNotAdded
InitFromUri_FullTypicalLangForge_AccountNameCorrect
InitFromUri_FullTypicalLangForge_DomainAndBandwidthCorrectAndNotCustom
InitFromUri_FullTypicalLangForge_ExistingProjectIdDisplayedOnLoad(False)
InitFromUri_FullTypicalLangForge_ExistingProjectIdDisplayedOnLoad(True)
InitFromUri_FullTypicalLangForge_PasswordCorrect
InitFromUri_FullTypicalLangForge_ProjectIdCorrect
InitFromUri_GivenCompleteUri_AllPropertiesCorrect
InitFromUri_HasFolderDesignator_IdIsCorrect
InitFromUri_LANPathGiven_CustomUrlIsTrue
InitFromUri_LanguageDepot_ConvertedToLanguageForge("hg-private",False)
InitFromUri_LanguageDepot_ConvertedToLanguageForge("hg-public",False)
InitFromUri_LanguageDepot_ConvertedToLanguageForge("resumable",True)
InitFromUri_NoUsernameOrPass_UsesSettings
InitFromUri_PrivateLangForge_DomainAndBandwidthCorrectAndNotCustom
InitFromUri_PrivateResumableLangForge_DomainAndBandwidthCorrectAndNotCustom
InitFromUri_ResumableLangForge_DomainAndBandwidthCorrectAndNotCustom
InitFromUri_UnknownHttpGiven_CustomUrlIsTrue
InitFromUri_UnknownHttpGiven_InitializesEverything
InitFromUri_UsernameAndPass_OverwritesSettings
InitialFileCommit_Invalid_BacksOut
InitiallyHasUsbTarget
InsertAtEndInOrder
InsertAtStartInOrder
InsertInMiddleInOrder
InsertedAdjacentDuplicateKey
InsertedDuplicateKeyNotAdjacent
InsertedDuplicatesAtStartAndEnd
InsertedOtherKeyBetweenDuplicates
KeyAttrAddedByCodeBeforeMergeIsRemoved
KnownHandlers_ContainsHandlersFromChorusExe
KnownHandlers_ReturnsDefaultLast
KnownKeyboards_AreMergedV2
KnownKeyboards_AreMergedV3
LanguagesAreMerged
LargeFileInExcludedDeeplyNestedPathIsNotFilteredOut
LargeFileInExcludedNestedPathIsNotFilteredOut
LargeFileInExcludedPathIsNotFilteredOut
LargeFileInNonExcludedFolderFiltered
LargeFileWithUnsupportedExtension_ShouldNotBeInRepo
LargeFilesWithSupportedExtension_ShouldNotBeInRepo
LargeMp3FileIsNotAllowed
LaunchDialog_AutoWithMinimalUI
LaunchDialog_BogusTarget_AdmitsError
LaunchDialog_CustomAddress
LaunchDialog_CustomSourceWillBeFound
LaunchDialog_CustomUrlSourceWontBeFound
LaunchDialog_ExampleForBob
LaunchDialog_FullAddress
LaunchDialog_GoodAddressNoFolder
LaunchDialog_GoodAddressWithFolderName
LaunchDialog_GoodForCancelTesting
LaunchDialog_LazyWithAdvancedUI
LaunchDialog_LazyWithNormalUI
LaunchDialog_LiveTest_FilterOutParatext
LaunchDialog_MinimalUI
LaunchDialog_SimulatedUsb_ProjectAlreadyExists
LaunchDialog_SimulatedUsb_USBHasInvalidRepo
LaunchUI_Blank
LaunchWithPreformedSettings
LayoutIsMerged
LiftSynchronizerReadsLift13VersionCorrectly
LiftSynchronizerReadsLift15VersionCorrectly
ListPatternsAreAtomic
LocalFolderName_WontAcceptSpacesAfterName
LocalFolderName_WontAcceptSpacesBeforeName
LongAddedFileIsfilteredOut
LongModifiedFileIsfilteredOut
LongUnknownFileIsfilteredOut
LongWavFileIsFilteredOutAndNotInRepo
LoserEditedWinnerDidNothing
Main_NoConflictFileB4_ConflictsEncountered_HaveConflictFileAfter
Main_UnhandledMergeFailure_Returns1
Main_Utf8FilePaths_FileNamesOk
MakeBundle_InvalidBase_FalseAndFileDoesNotExist
MakeBundle_ValidBase_BundleFileExistsAndReturnsTrue
MakeClone_NoProblems_MakesClone
MakeClone_TargetExists_CreatesCloneInAnotherFolder
MakeClone_TargetExists_CreatesCloneInWhenTargetIsEmpty
MakeListItemWhenAlreadyHaveProjectName_MakesDisabledItem
MakeListItemWhenRepoInUse_MakesDisabledItem
MakeListItem_InvalidRepositoryProducesDisabledItem
MakeListItem_MakesNormalItem
ManMadeRevisionNumber_HasExpectedStartingValues
MegabyteIs1024X1024
MergeChildren_UsesNodeToGenerateContextDescriptorIfPossible
MergeConflictFiles_AncestorDidNotExist
MergeConflictFiles_AncestorExistsButNoConflicts
MergeConflictFiles_CheckIsMutableIsUsedToSkipMergingMessages
Merge_AncestorAndOursSame_ResultHasTheirsAlso
Merge_DefinitionAncestorAndOursSameTheirsHasAdditionalForm_ResultHasAdditionalFormAlso
Merge_DeleteAndEditEntry_GeneratesConflictWithContext
Merge_DuplicateFormsInEntry_ResultHasWarningReport
Merge_DuplicateGuidsInEntry_ResultHasWarningReport
Merge_DuplicateKeyInGloss_NoThrow
Merge_DuplicateRelationsInEntry_ResultHasWarningReport
Merge_EditAndDeleteEntry_GeneratesConflictWithContext
Merge_MultiTextInFormInEntry_ResultHasWarningReport
Merge_RealConflictPlusModDateConflict_ModDateNotReportedAsConflict
Merge_TheirDuplicateRelationDoesNotResultInEmptyRelationElement
Merging_Both_Change_AttributelessExemplar_Works
Merging_Different_Characters_Changes_Works
Message_AuthorWithXmlChars_DoesNotThrow
Message_StatusWithXmlChars_DoesNotThrow
MetaData_Merged
MetaData_Preserved
MinimalCodeToLaunchSendReceiveUI
MoStemMsaHasMergeConflictOnPartOfSpeechAddedByBoth
MoreMinimal_MoveToFirstAttributeFix_HasElementsEqual
MoveToFirstAttributeFix_HasElementsEqual
MsarAddsObserverToAll
MsarAddsToPrimary
MsarCallsRemoveOnRepoContainingAnnotationOnly
MsarContainsItemInOthers
MsarContainsItemInPrimary
MsarDoesNotContainUnknownItem
MsarGetsMatchesFromPrimaryAndSecondaries
MsarSaveNowSavesAll
MultipleAttributeKeyedElement_IsFound
MultipleAttributeKeyedElement_WithDoubleAndSingleQuoteInAttribute_IsFound
NestedClosedNodeAndEmptyWithAttributesAreEqual
NestedClosedNodeAndTextWithAttributesAreNotEqual
NewEntryFromThem_Conveyed
NewEntryFromThem_HasAdditionChangeReport
NewEntryFromUs_Conveyed
NewEntryFromUs_HasNoChangeReports
NewEntryFromUs_Reported
NewStyleMainItemRemovedByThemEditedByUsHasHasCorrectRemovedEditConflicts
NewStyleMainItemRemovedByUsEditedByThemHasCorrectRemovedEditConflicts
NewStyle_DoomedByThemEditedByUs_HasOneConflict
NewStyle_DoomedByUsEditedByThem_HasOneConflict
NewWSAddedToNote_Merged
NewerLiftVersion_Handled
NoMatchingFileHandlers_DoesNothing
NoPatternsSpecified_FileIsNotAdded
NobodyDidAnything
NobodyDidAnythingHasNoReports
NobodyMadeChangesWithContent
NobodyTouchedExtantOptionalFirstElement
NonConflictingEditsInAtomicSpecialHasConflictReport
NonEquivalentByteArraysAreNotEqual
NonNullElementsWithNoChildNodesIsNotTextlevel
NormallyExcludedFileIsNotAddedByLargeFileFilter
NormallyExcludedFwdataFileIsNotAddedByLargeFileFilter
NormallyExcludedNestedFileIsNotAddedByLargeFileFilter
NormallyExcludedNestedLargeFileIsNotAddedByLargeFileFilter
NotAtomicStrategyReturnsFalse
NotEqualResultForDifferentAttributeNames
NotEqualResultForDifferentAttributeValues
NotEqualResultForDifferentAttributeValuesAndSequences
NotEqualResultForDifferentCDataElements
NotEqualResultForDifferentElements
NotEqualResultForDifferentLengthElements
NotEqualResultForDifferentNumberOfAttributes
NotEqualResultForDifferentTextElements
NotEqualResultForElementsWhereSecondGoesDeeper
NotEqualResultForEmptyVsNotEmptyElements
NotesFileInOtherHgRepoNotInThisAnnotationrepository
NullMergerThrows
NullNodeIsAnAmbiguousTextNode
NullServerInfoThrowsOnCreateChorusHubClientAttempt
NullStrategyThrows
NumbersIsMerged
OldStyleMainItemEditedByUsRemovedByThemHasCorrectRemovedEditConflicts
OldStyleMainItemRemovedByUsEditedByThemHasCorrectRemovedEditConflicts
OldStyle_DoomedByThemEditedByUs_HasOneConflict
OldStyle_DoomedByUsEditedByThem_HasOneConflict
OlderLiftVersion_Handled
OneAddedASyblingElement_GetBoth
OneAddedNewChildElement
OneAddedOneTranslationOtherEditedFormText
OneAddedOneTranslationWhileOtherAddedAnother_Merged
OneAddedSomethingDeep
OneDeletedAndAdded_TheOtherEditedOriginal
OneDeletedOtherDidNothingAtomicElement_DeletesWithNoConflict
OneEditedDeepChildOfElementOtherDeleted
OneEditedExampleWhileOtherAddedTranslation_MergesButRaiseWarning
OnePutTextContentInPreviouslyElement
OnlyModificationDateChanged_NoConflictOrRecordedChange
OnlyOneDeletedMainItemHasNoChangeReport
OnlyOneDeletedOptionalFirstElementHasNoChangeReports
OurCommitOnlyFailsCommitCopCheck
OurDeletedEntryReported
OurNewEntryReported
OursIsNotXmlThrows
OutputsStdErr
OutputsStdOut
ParentOrderIsRelevant_TrumpsChildOrderIsRelevant
PasswordForSession_PrefersCached
PasswordForSession_UsesCached
PasswordForSession_UsesSaved("")
PasswordForSession_UsesSaved("myPass")
PasswordForSession_UsesSaved(null)
PopulateAvailableProjects
PopulateAvailableProjects_NoProjects("")
PopulateAvailableProjects_NoProjects("[]")
PopulateAvailableProjects_ThrowsBadJson
PopulateAvailableProjects_ToleratesExtraProperties
PopulateAvailableProjects_ToleratesMissingProperties
PreMergeCalledBeforeMerging
PreMergeCollationDoesNotDisruptDateOrLoseTheirChanges
PreMergeDoesNotThrowWhenCommonIsEmptyAndBothAdded
PreMerge_DoesNotCrashIfChangesAreMissingCollation
ProjectFolderConfiguration_IsNotNewEachMorning
PullThenPush_Test
Pull_BundleInMultipleChunks_Success
Pull_BundleInOneChunk_Success
Pull_FileIsLocked_GetTimeoutException
Pull_GetRevisionServerResponseServerNotAvailable_NotAvailableMessageAndFails
Pull_InitialServerResponseServerNotAvailable_NotAvailableMessage
Pull_InvalidBaseHashFromServer_ClientRecoversSuccessfully
Pull_LocalOnNewBranch_Success
Pull_LocalRepoAndRemoteRepoUpdatedIndependently_Success
Pull_NoChangesInRepo_NoChanges
Pull_OneLocalChangeNothingToPullOn2BranchRemote_Success
Pull_PullOperationFailsMidway_ContinuesToCompletion
Pull_RemoteOnNewBranch_Success
Pull_ServerNotAvailableMidTransaction_NotAvailableMessage
Pull_SomeTimeOuts_Success
Pull_SucessfulPull_PullBundleDataIsRemoved
Pull_Test
Pull_UnknownServerResponse_Fails
Pull_UserCancelsMidwayTheRemoteRepoChanges_PullFinishesSecondPull
Push_2DifferentApiServers_HgRepoFileUpdatedWithBothEntries
Push_2PushesAndRemoteRepoDbFileUpdated_Success
Push_InitialServerResponseServerNotAvailable_NotAvailableMessage
Push_InvalidBaseHashFromServer_ClientRecoversSuccessfully
Push_LargeFileSizeBundle_Success
Push_LocalOnNewBranchRevisionsExceedQuantity_SendsData
Push_LocalOnNewBranch_DoesNotThrow
Push_LocalOnNewBranch_SendsData
Push_MultiChunkBundleAndUnBundleFails_Fail
Push_OneLocalChangeNothingToPullOn2BranchRemote_Success
Push_RemoteOnNewBranch_DoesNotThrow
Push_RemoteOnNewBranch_SendsData
Push_RemoteRepoDbNotExistsAndSetsCorrectlyWithRevHash_Success
Push_RemoteRepoIsEmptyRepo_PushesBundleSuccessfully
Push_RemoteRepoIsUnrelated_Throws
Push_RemoteRevisionCacheWorksWhenReceivingMoreThanRequestedRevisions
Push_ServerNotAvailableMidTransaction_NotAvailableMessage
Push_SingleResponse_OK
Push_SomeServerTimeOuts_Success
Push_SuccessfulPush_PushDataCacheDestroyed
Push_UnknownServerResponse_Fails
Push_UserCancelsMidwayAndBeginsAgainWithAdditionalPush_Resumes
Push_UserCancelsMidwayThenRepoChanges_PushDoesNotResume
QuitelyMilestoneSomeRecentWork
RangeSectionMergedCorrectly
Recover_Cp1252ProjectPath_NoThrow
Recover_UnicodeProject_NoThrow
Ref_HasUrl_ReturnsUrl
RelationsMergeWithoutThrowing
RememberPassword("temporary","",False)
RememberPassword(null,"",False)
RememberPassword(null,"rememberMe",True)
RememberPassword(null,null,False)
RememberPasswordByDefault
RemoveCredentialsFromIniIfNecessary("LanguageDepot [QA] [Resumable]","https://bob:[email protected]/ngl-flex","https://resumable-qa.languageforge.org/ngl-flex")
RemoveCredentialsFromIniIfNecessary("LanguageDepot","https://user:[email protected]/ngl-flex","https://hg-public.languageforge.org/ngl-flex")
RemoveCredentialsFromIniIfNecessary_PreservesOtherData("dan","remembered","shibboleth")
RemoveCredentialsFromIniIfNecessary_PreservesOtherData("naphtali",null,null)
RemoveCredentialsFromIniIfNecessary_PreservesOtherData(null,null,"shibboleth")
RemoveOldLocks_LockAndHgIsRunning_ReturnsFalse
RemoveOldLocks_NoLocks_ReturnsTrue
RemoveOldLocks_WLockAndHgIsRunning_ReturnsFalse
RemoveOldLocks_WLockAndLockButNotRunningHg_BothLocksRemoved
RemoveOldLocks_WLockButNotRunningHg_LockRemoved
RemovePasswordForLog_NullAndEmptyDoNotCrash
RemovePasswordForLog_RemovesOnlyThePassword
RemovePasswordForLog_RemovesTheEscapedPassword
RemovePasswordForLog_RemovesThePassword
Remove_2AnnotationsWithSameTarget_OnlyRemoves1FromIndex
Remove_AnnotationAddedDynamically_RemovesIt
Remove_AnnotationFromFile_RepositoryNotifiesIndices
Remove_AnnotationWasAddedDynamically_RepositoryNotifiesIndices
Remove_FromConstructorOnlyAnnotationsOfKey_RemovesIt
Remove_FromXmlOnlyAnnotationsOfKey_RemovesIt
Remove_IndexAddedAfterRepoConstruction_RemovesIt
RemovedVsEditedElementConflict_RoundtripThroughXml
ReorderModifyAndInsert
ReorderedEntry_Reordered
ReplaceOursWithTheirs_DocumentNodeAsParentThrows
ReplaceOursWithTheirs_NullParentNodeThrows
ReplaceOursWithTheirs_OursNotNullTheirsNotNull
ReplaceOursWithTheirs_OursNotNullTheirsNull
ReplaceOursWithTheirs_OursNullTheirsNot
RepoProjectName_SourceHasDotInName_IsNotLost
RepositoryRecoversFromIncompleteMerge
RepositoryURIForLog_ChorusHubWithVariable_DoesNotThrow
RepositoryURIForLog_ContainsNoPassword
ResolveButtonClicked_NewMessageHasContents_ResolutionAndMessageAreOne
ResultIsUtf8
RetrieveHistoricalVersionOfFile_BogusFile_Throws
RetrieveHistoricalVersionOfFile_BogusHash_Throws
RetrieveHistoricalVersionOfFile_GetsCorrectContentsOfText
RoundTripLastKnownCommonBases_ResultsAreTheSame
Run_BothAddedDifferentKeyedNodes_OrderIrrelevant_NoConflict
Run_BothAddedDifferentKeyedNodes_OrderIsRelevant_OrderAmbiguityConflict
Run_BothChangedKeyedNode_GetBothEditedConflict
Run_BothChangedSingletonNode_GetBothEditedConflict
Run_BothDeletedNonTextNodeHasChangeReport
Run_BothMovedDifferentKeyedNodes_OrderIrrelevant_NoDuplicatesCreated
Run_WeAddedElement_ListenerGetsAdditionReport
Run_WeDeletedElement_ListenerGetsDeletionEditReport
Run_WeEditedTextElementInsideKeyedElement_ListenerGetsTextEditReport
Run_WeEditedTextElementInsideOneOfTWoKeyedElements_ListenerGetsTextEditReport
Run_WeEditedTextElementInsideSingleton_ListenerGetsTextEditReport
Run_WeRemoved_TheyEdited_TextNode_GetConflictReport
SameResultForTwoInvocations
SaveAndLoad_10KRecords_CompletesQuickly
SaveSettings_ForgetsPassword
SaveSettings_NoHgFolderExists_CreatesOneWithCorrectPath
SaveSettings_PreexistsAndWeSave_MovesCredentials(False)
SaveSettings_PreexistsAndWeSave_MovesCredentials(True)
Save_AfterCreatingFromFile_IsSaved
Save_AfterCreatingFromString_GivesMessage
Save_DoesntExistYet_CreatesAndSavesAsCanonicalXml
SecondCheckin_Invalid_BacksOut
SendReceiveWithNoRemoteChangesGetsNoFiles
SendReceiveWithTrivialMergeCallsSimpleUpdate
SetAndGetDefaultSyncRepositories
SetGlobalProxyInfo_TODO
SetRepositoryAliases
SetTheOnlyAddressOfThisType_HadAnotherType_HasOldAddressAndNew
SetTheOnlyAddressOfThisType_SettingInternetPathHadSameType_IsReplacedByNew
SetTheOnlyAddressOfThisType_SettingLANPathHadSameType_IsReplacedByNew
SetTheOnlyAddressOfThisType_WasEmtpy_HasNewAddress
SetUrlToUseIfSettingsAreEmpty_RepoAlreadyExistsWithAServerAddress_IgnoresOfferedUrl
SetUserNameInIni_HgrcIsOpenFromAnotherProcess_GetTimeoutException
SetUserNameInIni_SetsName
SettingSychronizerAdjunctToNullEndsWithDoNothingDefaultInterfaceImplementation
ShortAddedFileIsAllowed
ShortUnknownFileIsAllowed
ShowIt
ShowNotesBar
ShowNotesBrowser_LargeNumber
ShowNotesBrowser_SmallNumber
ShowSyncDialog_InternetAndNetworkPaths
ShowSyncDialog_InternetAndNetworkPaths_WindowsStyle
ShowSyncStartControl_NoPaths
ShowSynchronizationDialogWhichGivesUsersChoices
SimpleChangeGeneratesReport
SkipConvertingElementToTextElementInAnotherFile
SmallFileInNonExcludedFolderNotFilteredByExclusionAtDeeperNesting
SpellchecksAreMerged
StarDotExtensionPatternSpecified_FileAdded
StartOfWindow_NoWrites_Zero
StartOfWindow_WriteBytes_LengthOfBytes
Status_HasStatus_ReturnsStatus
StripCredentialsAndQuery_WorksForLanguageForge
StripCredentialsAndQuery_WorksForLift
SyncNow_AlreadySetupFauxUsbAvailable_UsbGetsSync
SyncNow_BackupAlreadySetUp_GetsSync
SyncNow_FileMissing_GetsRemoved
SyncNow_NotSetupBefore_GetsClone
SyncNow_OnlyABlankFauxUsbAvailable_UsbGetsClone
SyncNow_SetsUpHgrc
SyncNow_UsbGetsBackwardCompatibleBareCloneWithReadme
Sync_AfterSyncLogNotEmpty
Sync_BothChangedBinaryFile_FailureReportedOneChosenSingleHead
Sync_Cancelled_ResultsHaveCancelledEqualsTrue
Sync_ExceptionInMergeCode_LeftWith2HeadsAndErrorOutputToProgress
Sync_ExistingRejectChangeSet_NotMergedIn
Sync_FileLockedForReadingDuringMerge_LeftWithMultipleHeads
Sync_FileLockedForWritingDuringUpdate_GetUpdatedFileOnceLockIsGone
Sync_FirstCheckInButNoFilesAdded_NoProblem
Sync_GetUsbStatusLink_MultipleUsb
Sync_GetUsbStatusLink_NoUsb
Sync_GetUsbStatusLink_OneUsb
Sync_HgrcInUseByOther_FailsGracefully
Sync_MergeFailure_LeavesNoChorusMergeProcessAlive
Sync_MergeFailure_NoneOfTheOtherGuysFilesMakeItIntoWorkingDirectory
Sync_MergeTimeoutExceeded_LeavesNoChorusMergeProcessAlive
Sync_MergeWhenThereIsMoreThanOneHeadToMergeWith_MergesBoth
Sync_ModifiedFileIsInvalid_CheckedInButThenBackedOut
Sync_NewFileWithNonAsciCharacters_FileAdded
Sync_NonExistentLangForgeProject_ExitsGracefullyWithCorrectErrorResult
Sync_RepeatedMergeFailure_WeAreLeftOnOurOwnWorkingDefault
Sync_TheyHaveAFileWhichWeAlsoEditedButHavenotCheckedIn_OursIsRenamedToSafetyAndWeGetTheirs
Sync_WeHaveAFileWhichTheyAlsoEditedButHavenotCheckedIn_TheirsIsRenamedToSafetyAndTheyGetOurs
Sync_WeHaveUntrackedFile_NotRenamed
SynchNow_OnDefaultBranchAndAnotherBranchExists_DoesNotMergeWithIt
SynchNow_OnNamedBranchAndDefaultBranchExists_DoesNotMergeWithIt
SynchronizerWithOnlyCurrentBranchRevision_ReportsNothing
Synchronizer_DoesNotReportOldChangeOnOtherBranch
Synchronizer_HandlesBothDefaultBranchOptions
Synchronizer_HandlesMultipleBranches
Synchronizer_ReportsNewChangeOnOtherBranch
TestFromFb
TestGetPotentialRepoUri
TestIsMatchingName("1")
TestIsMatchingName("2")
TestIsMatchingName("3")
TestIsMatchingName("54")
TestIsMatchingName("NaN")
TestNewVersion_SallyAndBobUpgradeButFredDelays
TestNewVersion_SallyUpgradesToBobVersion
TestNewVersion_SallyUpgrades_BobNotYet
TestTryGetBestRepoMatch
Test_GetProxyAndCredentials
TextElementBothEditedOuterWhiteSpaceIgnored
TextElement_BothDeleted_NoConflicts
TextElement_EachEdited_OursKept_ConflictRegistered
TextElement_OneAdded_NoConflicts
TextElement_TheyEditedWeDeleted_EditedIsKept_ConflictRegistered
TextElement_WeEditedTheyDeleted_OursKept_ConflictRegistered
TextNodeIsNotTextNode
TheirsIsNotXmlThrows
TheyAddedAtomicOwnedElementToExtantProperty_WeDidNothing
TheyAddedAtomicOwnedElementToNewProperty_WeDidNothing
TheyAddedEmptyNodeWeAddedNodeAndContentHasOneAddReport
TheyAddedHasOneChangeAndNoConflicts
TheyAddedNewEntryInfileWithNoEntries
TheyAddedNewTextElementToNonExistingElementWeDidNothingHasOneChangeReport
TheyAddedNewTextToExtantTextElementWeDidNothingHasOneChangeReport
TheyAddedNodeHasChangeReport
TheyAddedStuffHasChangeReport
TheyAddedTextContentAndNodeWeDidNothingHasChangeReport
TheyChangedAttributeOneChangeNoConflicts
TheyChangedWeDeletedFileHasOneConflictReport
TheyDeleteAnElement_Removed
TheyDeleteNeighborsAndWeInsertInOrder
TheyDeletedAttributeHasOneChangeReportAndNoConflicts
TheyDeletedFileWeDidNothingHasOneChangeReport
TheyDeletedSameAtomicOwnedElement_WeDidNothing
TheyDeletedTextButLeftNodeAndWeDidNothingHasChangeReport
TheyDeletedTextNodeButNotTextParent1WeDidNothingHasOneChangeReport
TheyDeletedTextNodeButNotTextParent2WeDidNothingHasOneChangeReport
TheyDeletedTextStringButWeEditedItHasConflictReport
TheyDeletedWeEditedRegardlessOfMergeSituationHasConflict
TheyDeleted_HasChangeReport
TheyEditWeDoNothingSoTheyWinOnMerge
TheyEditedAtomicOwnedElementOnExtantProperty_WeDeletedThatElement
TheyEditedMainItemSenseGlossWeDidNothingHasNoReports
TheyEditedOptionalFirstElementHasNoReports
TheyEditedWeDidNothingOneChange
TheyEditedWeRemovedTheyWinWithConflict
TheyMadeChanges_WeDidNothing_Fires_SimpleUpdate_WithFalse
TimesOut
TipUpdatedPostMerge
TopLevelElementsAreSingleton
TransformsAreMerged
URL_AfterConstruction_GoodDefault
Unbundle_BadBundleFile_ReturnsFalse
Unbundle_BadPath_ReturnsFalse
Unbundle_ValidBundleFile_ReturnsTrue
UnchangedEntryInBoth_NotDuplicated
UpdateDisplay_BadModelDoesNotThrow
UpdateToBranchHeadCallsReturnExpected_UpdateResults
UpdateToLongHashOnEmptyRepoReturns_UpdateResults_NoCommitsInRepository
UpdateToLongHashOnNonEmptyRepoReturns_UpdateResults_Success
UpdateToLongHashOnNonExistantLongHashReturns_UpdateResults_NoSuchRevision
UpdateToLongHashOnSameLongHashReturns_UpdateResults_AlreadyOnIt
UsingWith_NumberOfChildrenAllowed_ZeroOrMore_Throws
UsingWith_NumberOfChildrenAllowed_ZeroOrOne_DoesNotThrowWhenParentHasCommentChildNode
UsingWith_NumberOfChildrenAllowed_ZeroOrOne_DoesNotThrowWhenParentHasNoChildNodes
UsingWith_NumberOfChildrenAllowed_ZeroOrOne_DoesNotThrowWhenParentHasOneChildNode
UsingWith_NumberOfChildrenAllowed_ZeroOrOne_ThrowsWhenAncestorHasMultipleChildNodes
UsingWith_NumberOfChildrenAllowed_ZeroOrOne_ThrowsWhenOursHasMultipleChildNodes
UsingWith_NumberOfChildrenAllowed_ZeroOrOne_ThrowsWhenTheirsHasMultipleChildNodes
UsingWith_NumberOfChildrenAllowed_Zero_DoesNotThrowWhenParentHasCommentChildNode
UsingWith_NumberOfChildrenAllowed_Zero_ThrowsWhenAncestorHasChildNode
UsingWith_NumberOfChildrenAllowed_Zero_ThrowsWhenOursHasChildNode
UsingWith_NumberOfChildrenAllowed_Zero_ThrowsWhenTheirsHasChildNode
Utf8ExtensionNotPresent_CloneLocalWithoutUpdateThrows
Utf8ExtensionNotPresent_MercurialOperationReportsError
Utf8ExtensionPresent_CloneDoesNotHaveBogusFiles
Utf8ExtensionPresent_CloneLocalWithUpdateDoesNotHaveBogusFiles
Utf8ExtensionPresent_LocalMercurialIniIncorrect_MercurialOpStillWorks
ValidateFileHasNoResultsForValiidFile
ValidateFile_BadLift_ReturnsProblem
ValidateFile_IllFormedXml_ReturnsProblem
ValidateFile_Returns_Message_For_Crummy_Ldml_File
ValidateFile_Returns_Message_For_Crummy_ProjectLexiconSettings_File
ValidateFile_Returns_Message_For_Empty_Pathname
ValidateFile_Returns_Message_For_Good_But_Not_Ldml_File
ValidateFile_Returns_Message_For_Good_But_Not_ProjectLexiconSettings_File
ValidateFile_Returns_Message_For_Null_Pathname
ValidateFile_Returns_Null_For_Good_File
ValidateFile_SimpleLift_ReturnsNull
ValidateFile_Throws
VeryFirstCommit_Invalid_Throws
WavFileInRepoEvenWhenExcluded
WeAddedAtomicOwnedElementToNewProperty_TheyDidNothing
WeAddedEmptyNodeTheyAddedNodeAndContentHasChangeReport1
WeAddedHasOneChangeAndNoConflicts
WeAddedNewEntryInfileWithNoEntries
WeAddedNewTextElementToNonExistingElementTheyDidNothingHasOneChangeReport
WeAddedNewTextToExtantTextElementTheyDidNothingHasOneChangeReport
WeAddedNodeHasChangeReport
WeAddedStuffHasChangeReport
WeBothAddedButNotTheSameTheyWinHasConflictReport
WeBothAddedButNotTheSameWeWinHasConflictReport
WeChangedAttributeOneChangeNoConflicts
WeChangedTheyDeletedFileHasOneConflictReport
WeDeleteNeighborsAndTheyInsertInOrder
WeDeletedAnElement_Removed
WeDeletedAttributeHasOneChangeReportAndNoConflicts
WeDeletedFileTheyDidNothingHasOneChangeReport
WeDeletedNodeButTheyChangedTextHasConflictReport
WeDeletedNodeTheyDeletedTextAndLeftNodeHasChangeReport
WeDeletedOtherwiseEmptyElementTheyDidNothingHasDeletionReport
WeDeletedSameAtomicOwnedElement_TheyDidNothing
WeDeletedTextButLeftNodeTheyDidNothingHasChangeReport
WeDeletedTextNodeButNotTextParent1TheyDidNothingHasOneChangeReport
WeDeletedTextNodeButNotTextParent2TheyDidNothingHasOneChangeReport
WeDeletedTextStringButTheyEditedItHasConflictReport
WeDeletedTextTheyDeletedTextAndNodeHasChangeReport
WeDeletedTheyEditedRegardlessOfMergeSituationHasConflict
WeDeleted_HasChangeReport
WeDidNothingTheyEditedTheyWinNoConflict
WeEditTheyDoNothingSoWeWinOnMerge
WeEditedMainItemSenseGlossTheyDidNothingHasNoReports
WeEditedOptionalFirstElementHasNoReports
WeEditedTextButTheyDeletedNodeHasConflictReport
WeEditedTheyDidNothingHasChangeReport
WeEditedTheyDidNothingOneChange
WeEditedTheyRemovedWeWinWithConflict
WeMadeIllegalChange_ButAncestorHasBeenRetored_HasNoReports
WeMarkedEntryAsDeleted_ReportedAsDeletion
WeRemovedEntry_Reported
WinnerEditedLoserDidNothing
WriteChunk_MultipleWritesOverWriteSameOffset_AssemblesOk
WriteChunk_Text_WriteOk
WriteChunk_WriteMultipleChunks_AssembledOk
WriteNode_DoesNotIndentChildWhenSuppressed
WriteNode_DoesNotIndentFirstChildOfMixedNode
WritingSystemAbbreviationElements_AreMerged
WritingSystemDefaultFontNameElements_AreMerged
WritingSystemDefaultFontSizeElements_AreMerged
WritingSystemIsGraphiteEnabledElements_AreMerged
WritingSystemKeyboardElements_AreMerged
WritingSystemKnownKeyboardsElements_AreMerged
WritingSystemLanguageNameElements_AreMerged
WritingSystemLegacyMappingElements_AreMerged
WritingSystemLocalKeyboardElements_AreMerged
WritingSystemRegionNameElements_AreMerged
WritingSystemScriptNameElements_AreMerged
WritingSystemSpellCheckingIdElements_AreMerged
WritingSystemSystemCollationElements_AreMerged
XmlBothDeletionChangeReport_ReportsCorrectChangeWithoutCrashing
XmlDeclarationNodeIsNotTextNode
XmlDeletionChangeReport_ReportsCorrectChangeWithoutCrashing
XmlMergerCallsImmutableElementMergeServiceForImmutableElement
XmlMergerDoesNotCallImmutableElementMergeServiceForMutableElement
View more details on GitHub Actions