diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
| commit | 1be510f9529cb082f802408b472a77d074b394c0 (patch) | |
| tree | b175f9d5fcb107576dabc768e7bd04d4a3e491a0 /zarb-ml/mageia-dev/2012-October/019561.html | |
| parent | fa5098cf210b23ab4f419913e28af7b1b07dafb2 (diff) | |
| download | archives-master.tar archives-master.tar.gz archives-master.tar.bz2 archives-master.tar.xz archives-master.zip | |
Diffstat (limited to 'zarb-ml/mageia-dev/2012-October/019561.html')
| -rw-r--r-- | zarb-ml/mageia-dev/2012-October/019561.html | 131 |
1 files changed, 131 insertions, 0 deletions
diff --git a/zarb-ml/mageia-dev/2012-October/019561.html b/zarb-ml/mageia-dev/2012-October/019561.html new file mode 100644 index 000000000..b14d81cca --- /dev/null +++ b/zarb-ml/mageia-dev/2012-October/019561.html @@ -0,0 +1,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> |