[Mageia-dev] mgarepo question

[Jani Välimaa]

On Sat, 27 Oct 2012 02:16:32 +0100
"Johnny A. Solbu" <cooker at solbu.net> wrote:

> Hi.
> I have encountered a problem with mgarepo that I've never had to deal
> with until now. A package I'm working on has been updated and
> submitted, before I was finished, and I'm fine with it. But «mgarepo
> up» is asking me what to do, and I have several choices. Two of the
> choices are «(mc) my conflict» and «(tc) their conflict». (translated)
> 
> I have never had a conflict hapening as a result of someone else
> working on my packages before, so I don't know which these to options
> do what. THink that one of them means that my copy is the copy to
> use, and the other option means that my copy is to be discarded in
> favour of the remote copy. but I don't know which option actually
> does what.
> 
> It is Not obvious what the options do, for someone not used to having
> conflicts. And the manpage or documentation does not mention any
> options of any kind. Can anyone explain to me what these two options
> do?
> 

See e.g.
http://svnbook.red-bean.com/en/1.7/svn.tour.cycle.html#svn.tour.cycle.resolve