Summary

This helper class is used to control a merge, providing help and data structures for the job.

Assembly

Mercurial.Net.dll

Namespace

Mercurial

Interfaces

Base Types

graph TD Base0["object"]-->Type Interface0["IEnumerable<T>"]-.->Type Interface1["IEnumerable"]-.->Type Type["MergeJob"] class Type type-node

Syntax

public class MergeJob : IEnumerable<MergeJobConflict>, IEnumerable

Type	Description
DefaultMemberAttribute

Name	Summary
MergeJob(Repository, MergeCommand)	Initializes a new instance of the `MergeJob` class.

Name	Value	Summary
Count	int	Gets the number of files in this `MergeJob` that had merge conflicts when the merge started.
LocalParent	Changeset	Gets the local parent revision number, ie. the "left" parent of the merge.
MergeCommand	MergeCommand	Gets the `MergeCommand` that initiated the merge.
OtherParent	Changeset	Gets the other parent revision number, ie. the "right" parent of the merge.
Repository	Repository	Gets the `Repository` this `MergeJob` is operating in.
State	MergeJobState	Gets a value indicating the current state of the merge job.
this[int]	MergeJobConflict	Gets the `MergeJobConflict` at the specified index.
this[string]	MergeJobConflict	Gets the `MergeJobConflict` with the specified filename; or `null` if there is no such `MergeJobConflict`.
UnresolvedConflicts	IEnumerable<T>	Gets a collection of `MergeJobConflict` objects that are still marked as `Unresolved`.

Name	Value	Summary
CancelMerge()	void	Cancels the merge by updating back to the initial parent.
Cleanup()	void	Cleans up temporary files left by the initial merge command (the .base, .local, .orig and .other files.)
Commit(CommitCommand)	RevSpec	Commits the changes introduced by this `MergeJob`.
Commit(string, CommitCommand)	RevSpec	Commits the changes introduced by this `MergeJob`.
GetEnumerator()	IEnumerator<T>	Returns an enumerator that iterates through the collection.
Refresh()	void	Refreshes the resolution status of the files that had merge conflicts when the merge started.