Re: [MiNT] [Mint-cvs] [FreeMiNT CVS] freemint/xaaes/src.km

[Thomas Juerges <thomas@sokrates.homelinux.net>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 2011-01-08 05:58, Helmut Karlowski wrote:
> I also believe this. But if it's true CVS should not complain. This only
> happens when committing to a foreign branch. But once before it worked.
> 
> Anyway, I've downloaded now the freemint-1_17-branch now.

Now I believe I finally get what the real problem is.  Let me try to
reflect.  Branches A and B below could be the trunk - which is nothing
else but another branch - or any branch as long as A != B.

- - You checked out your working copy of branch A to the local file system.
- - You modified a file on branch A, your local working copy.
- - [optional] You committed the modification of the file to branch A in
CVS.
- - You wanted to commit this same file of the local working copy of
branch A to branch B.

Is my assumption correct?  Then please read below.  If my assumption is
incorrect, then please ignore this message.  :-)  All other can read on
to get a refresh on how CVS works.

This cannot work, here is why.  CVS does not allow to commit files from
the local working copy of branch A to branch B in CVS without a proper
merge.  The files of the local working copy are tagged with a revision
and cannot simply be moved around branches.  One always has to follow
this procedure:
+++ Normal work flow +++
- - Check out branch A.
- - Modify file on branch A.
- - Commit changes to branch A.
+++ End of normal work flow +++
+++ Merge work flow +++
- - Check out a working copy of branch B to the local file system.
- - Merge files from branch A in CVS and not from the local working copy
of branch A on the file system(!) back to the local working copy of
branch B.
- - Commit changes to branch B.
+++ Enf of merge work flow +++

If this procedure is followed, then and only then, merges will be
successful.  A local working copy of directories and files always
belongs to one and only one branch and cannot and must not be shared
among branches.

Cheers,
	T.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk0o2CgACgkQMiyRSD9s+zXckQCfcydZJE31rhczwR2crt6DQdhv
gmsAn0Y5imhCx5TsmSdZE4GL9MLEhTIm
=KDVz
-----END PGP SIGNATURE-----