1

I had the same question as posted here:

Cleartool findmerge select changes from file 2 by default in all cases?

I tried the recommended fix (performing a clearfsimport from the source view to the destination view). I did this by (on Linux) setting a dynamic view for the destination, cd-ing into the VOB tag, then using /view/[source_viewname]/[vobname]/* as the source for the clearfsimport. The problem with this is that it attempts to create evil twins, which doesn't help the situation.

Are there any other ways of doing what's being asked in the original question posted above?

Community
  • 1
  • 1
karl_
  • 23
  • 4

1 Answers1

0

You could try a mixed approach:

  • use findmerge -ftag -merge -abort, as suggested: that should at least merge the folders.
  • for each folder where there is a conflict, use clearfsimport.

The key, to avoid any evil twin, is to make sure the folder is merged first (that will create entries for the files of that folder).
Then the clearfsimport won't try to create new files, but will update those entries, avoiding the evil twins.

The OP karl_ proposes in the comments:

I think I'll do the following:

findmerge -type d -abort on the first pass, let manual merges fail
findmerge -type d -exec "ct merge (manually merge the element from source)"

findmerge -type f -abort on this pass, let manual merges fail
findmegre -type f -exec "ct merge (manually merge the element from source)"

That is the right plan: first merge folders, then files. That way, no evil twins.

Community
  • 1
  • 1
VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250
  • You know what? Thinking about the whole thing a little more, I think I'll do the following: *findmerge -type d -abort on the first pass, let manual merges fail *findmerge -type d -exec "ct merge (manually merge the element from source)" *findmerge -type f -abort on this pass, let manual merges fail *findmegre -type f -exec "ct merge (manually merge the element from source)" That should do it all, right? – karl_ Aug 14 '15 at 14:37
  • @karl_ I like the idea: first merge folders, then files. I have included your proposition in the answer for more visibility. – VonC Aug 14 '15 at 17:41