git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
b69a12b390674517b48266cb88a9740084a3609e blob 1340 bytes (raw)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
 
#ifndef MERGE_STRATEGIES_H
#define MERGE_STRATEGIES_H

#include "object.h"

int merge_three_way(struct repository *r,
		    const struct object_id *orig_blob,
		    const struct object_id *our_blob,
		    const struct object_id *their_blob, const char *path,
		    unsigned int orig_mode, unsigned int our_mode, unsigned int their_mode);

typedef int (*merge_fn)(const struct object_id *orig_blob,
			const struct object_id *our_blob,
			const struct object_id *their_blob, const char *path,
			unsigned int orig_mode, unsigned int our_mode, unsigned int their_mode,
			void *data);

int merge_one_file_func(const struct object_id *orig_blob,
			const struct object_id *our_blob,
			const struct object_id *their_blob, const char *path,
			unsigned int orig_mode, unsigned int our_mode, unsigned int their_mode,
			void *data);

int merge_one_file_spawn(const struct object_id *orig_blob,
			 const struct object_id *our_blob,
			 const struct object_id *their_blob, const char *path,
			 unsigned int orig_mode, unsigned int our_mode, unsigned int their_mode,
			 void *data);

int merge_index_path(struct index_state *istate, int oneshot, int quiet,
		     const char *path, merge_fn fn, void *data);
int merge_all_index(struct index_state *istate, int oneshot, int quiet,
		    merge_fn fn, void *data);

#endif /* MERGE_STRATEGIES_H */
debug log:

solving b69a12b390 ...
found b69a12b390 in https://public-inbox.org/git/20201116102158.8365-6-alban.gruin@gmail.com/ ||
	https://public-inbox.org/git/20201113110428.21265-6-alban.gruin@gmail.com/
found d2f52d6792 in https://public-inbox.org/git/20201116102158.8365-5-alban.gruin@gmail.com/ ||
	https://public-inbox.org/git/20201113110428.21265-5-alban.gruin@gmail.com/
found e624c4f27c in https://public-inbox.org/git/20201124115315.13311-5-alban.gruin@gmail.com/ ||
	https://public-inbox.org/git/20201116102158.8365-4-alban.gruin@gmail.com/ ||
	https://public-inbox.org/git/20201113110428.21265-4-alban.gruin@gmail.com/

applying [1/7] https://public-inbox.org/git/20201124115315.13311-5-alban.gruin@gmail.com/
diff --git a/merge-strategies.h b/merge-strategies.h
new file mode 100644
index 0000000000..e624c4f27c

Checking patch merge-strategies.h...
Applied patch merge-strategies.h cleanly.

skipping https://public-inbox.org/git/20201116102158.8365-4-alban.gruin@gmail.com/ for e624c4f27c
skipping https://public-inbox.org/git/20201113110428.21265-4-alban.gruin@gmail.com/ for e624c4f27c
index at:
100644 e624c4f27c7f84a18213d3f7b0c8e6bdb8e833bc	merge-strategies.h

applying [2/7] https://public-inbox.org/git/20201116102158.8365-5-alban.gruin@gmail.com/
diff --git a/merge-strategies.h b/merge-strategies.h
index e624c4f27c..d2f52d6792 100644

Checking patch merge-strategies.h...
Applied patch merge-strategies.h cleanly.

skipping https://public-inbox.org/git/20201113110428.21265-5-alban.gruin@gmail.com/ for d2f52d6792
index at:
100644 d2f52d6792895c8e9b29963e2cd20693c734178c	merge-strategies.h

applying [3/7] https://public-inbox.org/git/20201116102158.8365-6-alban.gruin@gmail.com/
diff --git a/merge-strategies.h b/merge-strategies.h
index d2f52d6792..b69a12b390 100644

Checking patch merge-strategies.h...
Applied patch merge-strategies.h cleanly.

skipping https://public-inbox.org/git/20201113110428.21265-6-alban.gruin@gmail.com/ for b69a12b390
index at:
100644 b69a12b390674517b48266cb88a9740084a3609e	merge-strategies.h

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).