Re: [Monotone-devel] merge conflicts?

[Nathaniel Smith]

On Sat, Apr 01, 2006 at 01:41:45PM +0200, Lapo Luchini wrote:
> Whoops, I sync'ed with a laptop that had the quite old translations I
> did some months ago... and now "mtn merge" say this:
> 
> monotone: [source] 597dfcb31c5f9f1835157f5bcf03273625bf235b
> monotone: [source] c7db63267eaaa6718afacb1227f93323b53a4802
> monotone: warning: rename target conflict: nodes 1500, 1435, both want
> parent 390, name it.po
> monotone: warning: resolve non-content conflicts and then try again.
> monotone: error: merge failed due to unresolved conflicts
> 
> For now, I'm simply using -r in update to keep on the "modern" head, but
> eventually I will sync wrongly and push those old heads on venge.net, I
> fear.
> 
> What is the "real" solution to merge it?
> (and: what does it means both want to use name it.po? what's so strange
> about that that a simple call to kdiff3 can't resolve like usual?)

It means that you added the file twice in different revisions :-).
Monotone is therefore considering them to be different files, and both
of them want the same name, which is a conflict.

In an ideal world (i.e., "within a few months, probably"), we would
have workspace merge, and you would get a nice conflict where both
files end up in your tree, and you get to pick which one to keep,
delete or rename the other out of the way, etc.

The workaround to resolve the conflict for right now is to just delete
or move one of the files out of the _before_ merging.  So probably
what you want to do in this case is just check out the old head,
delete its it.po, and _then_ merge.

In an even more ideal world, we'd have suturing support, but it's a
bit of a pain:
   http://venge.net/monotone/wiki/HistoryBlueSky
So unlikely to happen while more day-to-day useful things are
missing...

-- Nathaniel

-- 
"Lull'd in the countless chambers of the brain,
Our thoughts are link'd by many a hidden chain:
Awake but one, and lo! what myriads rise!
Each stamps its image as the other flies"
  -- Ann Ward Radcliffe, The Mysteries of Udolpho