[Uml-devel] Thoughts on Umbrello 1.3

[Jonathan Riddell]

On Tue, Feb 03, 2004 at 10:24:19PM +0100, Sebastian Stein wrote:
> Jonathan Riddell <jr at jriddell.org> [040120 08:46]:
> > So any fixes to major problems should be done in HEAD and then merged back
> > into 3.2 carefully (cvs -j is rumoured to be good for this, ask if you
> > have any problems).
> 
> I want to update the ChangeLog file in HEAD and 3.2. Both have the same
> content. Do I first submit the HEAD ChangeLog? And what can I do next to
> merge in the changes to 3.2? Is another commit needed? I remember a Windows
> based CVS system, where you could say that a commit is valid for all
> branches, so in fact just one commit was needed.

There's no such easy system in the normal CVS.  For a single file you
need to just commit it once each for both branches.  For more complex
commits you can try merges with the -j option although I'm yet to
experiment with it.

Jonathan