[Monotone-devel] What _if_ the hash for two manifests happens to be the same?

[Magnus Therning]

I have been playing around with monotone (0.7 from the home page) a
little, trying to get a grip on it in order to determine if it will work
for me.

A small problem occured:

  $ monotone agraph
  graph:
  {
  node: { title : "13e966be8cc481756dc9ac83a2e1a2bcbab6c21e"}
  node: { title : "4f49a678a4bb8168626721b5d8e16bc340e3d956"}
  node: { title : "6785fd692d6acc23e021f5db36f98ef557430349"}
  node: { title : "c2b074a72152abe1b1c21b3e1fbb0d1d69ec8d5f"}
  node: { title : "ede6d4c15c3e59d5c8e3b4516dedc15995e652e1"}
  node: { title : "fbd4f2a8387398ecdd4dbc9e4128c0227a0d3dde"}
  node: { title : "fffcee1b404dd66e24be31a6ae94acb30bdf19de"}
  edge: { sourcename : "fbd4f2a8387398ecdd4dbc9e4128c0227a0d3dde"
          targetname : "c2b074a72152abe1b1c21b3e1fbb0d1d69ec8d5f" }
  edge: { sourcename : "c2b074a72152abe1b1c21b3e1fbb0d1d69ec8d5f"
          targetname : "fffcee1b404dd66e24be31a6ae94acb30bdf19de" }
  edge: { sourcename : "fffcee1b404dd66e24be31a6ae94acb30bdf19de"
          targetname : "4f49a678a4bb8168626721b5d8e16bc340e3d956" }
  edge: { sourcename : "c2b074a72152abe1b1c21b3e1fbb0d1d69ec8d5f"
          targetname : "13e966be8cc481756dc9ac83a2e1a2bcbab6c21e" }
  edge: { sourcename : "4f49a678a4bb8168626721b5d8e16bc340e3d956"
          targetname : "6785fd692d6acc23e021f5db36f98ef557430349" }
  edge: { sourcename : "13e966be8cc481756dc9ac83a2e1a2bcbab6c21e"
          targetname : "c2b074a72152abe1b1c21b3e1fbb0d1d69ec8d5f" }
  edge: { sourcename : "6785fd692d6acc23e021f5db36f98ef557430349"
          targetname : "c2b074a72152abe1b1c21b3e1fbb0d1d69ec8d5f" }
  edge: { sourcename : "c2b074a72152abe1b1c21b3e1fbb0d1d69ec8d5f"
          targetname : "ede6d4c15c3e59d5c8e3b4516dedc15995e652e1" }
  }

As you can see I managed to get a merge of two heads with the same
manifest hash as a previous one (the nice circles in the graph :-).

Could I have prevented this in some way?
How do I resolve this? ('monotone co c2b .' gives me the first version)

If there is a solution to this I think it should be mentioned in the
FAQ or the documentation.

/M

-- 
Magnus Therning                    (OpenPGP: 0xAB4DFBA4)
address@hidden
http://magnus.therning.org/

Every extension is an amputation.
     -- Marshall McLuhan

signature.asc
Description: Digital signature