[cvsnt] Committing unmodified file after merge

[Phil Richards]

On 2004-01-29, Harrison, Andrew <andy.harrison at anite.com> wrote:
>  Yeah, I see your point. I guess the best way to get around it is when you
>  would want to merge Main->Dev2, instead you branch off Main again with
>  Dev2.1 and merge Dev2->Dev2.1 and carry on from there. Any reason why that
>  shouldn't work?

It should... probably.  Try it and see :-)

We get round the problem (somewhat) by only allowing multiple
merges from mainline-to-branch, but only one from branch-to-mainline.
We bypass mergepoint processing for the branch-to-mainline delivery
to avoid null deltas.

phil
-- 
change name before "@" to "phil" for email