blob: b14d81cca79251d558fa4b8030786d7b3b56d62b (
plain)
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
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-dev] mgarepo question
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20mgarepo%20question&In-Reply-To=%3C20121027085200.4b896987.jani.valimaa%40gmail.com%3E">
<META NAME="robots" CONTENT="index,nofollow">
<META http-equiv="Content-Type" content="text/html; charset=us-ascii">
<LINK REL="Previous" HREF="019560.html">
<LINK REL="Next" HREF="019562.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-dev] mgarepo question</H1>
<B>Jani Välimaa</B>
<A HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20mgarepo%20question&In-Reply-To=%3C20121027085200.4b896987.jani.valimaa%40gmail.com%3E"
TITLE="[Mageia-dev] mgarepo question">jani.valimaa at gmail.com
</A><BR>
<I>Sat Oct 27 07:52:00 CEST 2012</I>
<P><UL>
<LI>Previous message: <A HREF="019560.html">[Mageia-dev] mgarepo question
</A></li>
<LI>Next message: <A HREF="019562.html">[Mageia-dev] Duplicate reception of email messages
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#19561">[ date ]</a>
<a href="thread.html#19561">[ thread ]</a>
<a href="subject.html#19561">[ subject ]</a>
<a href="author.html#19561">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>On Sat, 27 Oct 2012 02:16:32 +0100
"Johnny A. Solbu" <<A HREF="https://www.mageia.org/mailman/listinfo/mageia-dev">cooker at solbu.net</A>> wrote:
><i> Hi.
</I>><i> I have encountered a problem with mgarepo that I've never had to deal
</I>><i> with until now. A package I'm working on has been updated and
</I>><i> submitted, before I was finished, and I'm fine with it. But «mgarepo
</I>><i> up» is asking me what to do, and I have several choices. Two of the
</I>><i> choices are «(mc) my conflict» and «(tc) their conflict». (translated)
</I>><i>
</I>><i> I have never had a conflict hapening as a result of someone else
</I>><i> working on my packages before, so I don't know which these to options
</I>><i> do what. THink that one of them means that my copy is the copy to
</I>><i> use, and the other option means that my copy is to be discarded in
</I>><i> favour of the remote copy. but I don't know which option actually
</I>><i> does what.
</I>><i>
</I>><i> It is Not obvious what the options do, for someone not used to having
</I>><i> conflicts. And the manpage or documentation does not mention any
</I>><i> options of any kind. Can anyone explain to me what these two options
</I>><i> do?
</I>><i>
</I>
See e.g.
<A HREF="http://svnbook.red-bean.com/en/1.7/svn.tour.cycle.html#svn.tour.cycle.resolve">http://svnbook.red-bean.com/en/1.7/svn.tour.cycle.html#svn.tour.cycle.resolve</A>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="019560.html">[Mageia-dev] mgarepo question
</A></li>
<LI>Next message: <A HREF="019562.html">[Mageia-dev] Duplicate reception of email messages
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#19561">[ date ]</a>
<a href="thread.html#19561">[ thread ]</a>
<a href="subject.html#19561">[ subject ]</a>
<a href="author.html#19561">[ author ]</a>
</LI>
</UL>
<hr>
<a href="https://www.mageia.org/mailman/listinfo/mageia-dev">More information about the Mageia-dev
mailing list</a><br>
</body></html>
|
