[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

RE: merge mode for XML

From: Paul Sander
Subject: RE: merge mode for XML
Date: Sat, 4 May 2002 11:35:38 -0700

>--- Forwarded mail from address@hidden

>Greg is talking about the second issue.  I have an
>inkling keeping this info on a per-version basis won't
>work but I haven't come up with anything substantial.

Here's one:

- Create a new file and check in a few versions on the trunk.
- Create a branch.
- Check in a few versions on the branch, but change the data type before
  the first commit.  All versions on the branch contain the same data type,
  but they differ from the trunk.
- Merge the branch to the trunk *OR* update the branch from the trunk.

What's the correct action for the last step?  Is it to refuse to merge
because the tools are different?  Is it to copy the contributor and change
the data type on the target?  Is it to somehow convert one data type to
the other and invoke the proper merge tool and record that tool with the
next commit?

None of these choices is a good one because there are valid cases where
each one is correct.  I'm inclined to go with the first one and diagnose
an error, but I'm sure others would disagree.

>--- End of forwarded message from address@hidden

reply via email to

[Prev in Thread] Current Thread [Next in Thread]